From 384dcc67ba343815cc8434e05ec9a40cc618f061 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 14:53:31 +0100 Subject: [PATCH 01/13] =?UTF-8?q?=F0=9F=94=84=20-=20Updated=20variable=20n?= =?UTF-8?q?ames=20from=20`t=5Fburn`=20to=20`t=5Fplant=5Fpulse=5Fburn`=20in?= =?UTF-8?q?=20documentation=20files=20to=20reflect=20the=20new=20terminolo?= =?UTF-8?q?gy.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/io/utilities.md | 2 +- .../inductive_plasma_current.md | 2 +- documentation/physics-models/pulsed-plant.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 2 +- examples/data/large_tokamak_nof_MFILE.DAT | 2 +- process/availability.py | 6 ++--- process/constraints.py | 6 ++--- process/costs.py | 2 +- process/data_structure/numerics.py | 2 +- process/data_structure/times_variables.py | 10 +++---- process/evaluators.py | 2 +- process/input.py | 2 +- process/io/mfile_comparison.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 10 +++---- process/io/variable_metadata.py | 2 +- process/objectives.py | 6 ++--- process/pfcoil.py | 6 ++--- process/physics.py | 26 +++++++++++-------- process/pulse.py | 12 +++++---- process/stellarator.py | 6 ++--- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/spherical_tokamak_eval.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_availability.py | 6 ++--- tests/unit/test_costs_1990.py | 10 ++++--- tests/unit/test_physics.py | 8 +++--- tests/unit/test_power.py | 4 +-- tracking/tracking_data.py | 2 +- 34 files changed, 83 insertions(+), 75 deletions(-) diff --git a/documentation/io/utilities.md b/documentation/io/utilities.md index 980f56d612..6489d57143 100644 --- a/documentation/io/utilities.md +++ b/documentation/io/utilities.md @@ -109,7 +109,7 @@ Produces a three-page PDF file in the same directory as the input MFILE. The PDF `Plasma Composition` - Number densities of several ion species relative to the electron density. `Coil Currents etc` - Peak coil currents of the PF coils in $\text{MA}$, flux swing of the central solenoid -used for startup and total available in $\text{Wb}$. Total burn time `t_burn` in hrs. +used for startup and total available in $\text{Wb}$. Total burn time `t_plant_pulse_burn` in hrs. `Cost of electricity` - This is the cost of electricity in $ $/ \text{MWh}$. Check the respective cost model for the reference year of the inflation used. diff --git a/documentation/physics-models/plasma_current/inductive_plasma_current.md b/documentation/physics-models/plasma_current/inductive_plasma_current.md index 61e73e08e9..b32a95eb9d 100644 --- a/documentation/physics-models/plasma_current/inductive_plasma_current.md +++ b/documentation/physics-models/plasma_current/inductive_plasma_current.md @@ -143,7 +143,7 @@ where $\rho_\text{p}$ is the calculated [plasma resistivity](./plasma_resistive_ The total flux required is then simply found by multiplying the loop voltage above by the required duration of the burn phase: $$ -\overbrace{\Phi_{\text{res,burn}}}^{\texttt{vs_burn_required}} = \overbrace{I_{\text{p}} \rho_\text{p} f_{\text{ind}}}^{\texttt{v_burn_resistive}} \times \overbrace{T_{\text{burn}}}^{\texttt{t_burn}} +\overbrace{\Phi_{\text{res,burn}}}^{\texttt{vs_burn_required}} = \overbrace{I_{\text{p}} \rho_\text{p} f_{\text{ind}}}^{\texttt{v_burn_resistive}} \times \overbrace{T_{\text{burn}}}^{\texttt{t_plant_pulse_burn}} $$ ---------------- diff --git a/documentation/physics-models/pulsed-plant.md b/documentation/physics-models/pulsed-plant.md index fbd7bbb406..9a6c3058d3 100644 --- a/documentation/physics-models/pulsed-plant.md +++ b/documentation/physics-models/pulsed-plant.md @@ -58,7 +58,7 @@ Over the course of a pulse, the timings are detailed as: - Precharge (`t_precharge`) - the CS current ramps from zero to maximum value. The other PF coils also ramp from zero to their required values. - Current ramp-up (`t_current_ramp_up`) - The plasma current ramps up to approx full value. Auxiliary heating is possibly on. - Fusion ramp (`t_fusion_ramp`) - The plasma temperature and density rise to the full values. The CS and other PF coil currents all change steadily. Auxiliary heating is on. -- Burn time (`t_burn`) - Flat-top duration. The plasma is approximately steady. Fusion power and electricity are produced. The CS and other PF coil currents all change steadily in a pulsed reactor, but are constant for a "steady-state" reactor. Auxiliary heating is on. +- Burn time (`t_plant_pulse_burn`) - Flat-top duration. The plasma is approximately steady. Fusion power and electricity are produced. The CS and other PF coil currents all change steadily in a pulsed reactor, but are constant for a "steady-state" reactor. Auxiliary heating is on. - Ramp-down (`t_ramp_down`) - The plasma current, density and temperature all ramp down to zero simultaneously. As a starter for ten we could assume that the CS and PF coil currents also ramp to zero at the same time. Auxiliary heating is possibly on. - Between pulse (`t_between_pulse`) - CS and PF coil currents are zero - a few minutes may be required to permit vacuum pumping. May be much longer for an experimental device such as DEMO. - Pulse repitition (`t_pulse_repitition`) - Sum of all the above times. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 88f3853e18..76babf417a 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -560,7 +560,7 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6699E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.1999E+03 OP + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.1999E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6699E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8441E+03 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index d63310ed55..dc844938b1 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -558,7 +558,7 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 775c47aa6f..11c88dd4a7 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -558,7 +558,7 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index d859ed92ce..bc77160b1e 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -558,7 +558,7 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 45ae23dac8..89a1d0171b 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -558,7 +558,7 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index 47eac702e1..3b0b502662 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -453,7 +453,7 @@ Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.60910954080422698e+02 Heating_time_(s)_________________________________________________________ (t_fusion_ramp)________________ 1.00000000000000000e+01 - Burn_time_(s)____________________________________________________________ (t_burn)_______________________ 6.13029258726831449e+03 OP + Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.60910954080422698e+02 Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_cycle)______________________ 8.76211449542915943e+03 OP diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index 01f26fab5d..8238b7c88e 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -527,7 +527,7 @@ Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.75262350092394996e+02 Heating_time_(s)_________________________________________________________ (t_fusion_ramp)________________ 1.00000000000000000e+01 - Burn_time_(s)____________________________________________________________ (t_burn)_______________________ 7.34493213699665284e+03 OP + Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.75262350092394996e+02 Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_cycle)______________________ 1.00054568371814421e+04 OP diff --git a/process/availability.py b/process/availability.py index 260c7ef9b7..3968f3fc00 100644 --- a/process/availability.py +++ b/process/availability.py @@ -176,7 +176,7 @@ def avail(self, output: bool): # Capacity factor # Using the amount of time burning for a given pulse cycle - cv.cpfact = cv.cfactr * (tv.t_burn / tv.t_cycle) + cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_cycle) # Modify lifetimes to take account of the availability if ifev.ife != 1: @@ -383,7 +383,7 @@ def avail_2(self, output: bool): cv.cplife = min(cv.cplife / cv.cfactr, cv.tlife) # Capacity factor - cv.cpfact = cv.cfactr * (tv.t_burn / tv.t_cycle) + cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_cycle) # Output if output: @@ -1146,7 +1146,7 @@ def avail_st(self, output: bool): cv.cplife = min(cv.cplife / cv.cfactr, cv.tlife) # Capacity factor - cv.cpfact = cv.cfactr * (tv.t_burn / tv.t_cycle) + cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_cycle) if output: po.ocmmnt(self.outfile, "Plant Availability") diff --git a/process/constraints.py b/process/constraints.py index ec58009caa..e42977b5cb 100644 --- a/process/constraints.py +++ b/process/constraints.py @@ -548,19 +548,19 @@ def constraint_equation_13(): author: P B Lloyd, CCFE, Culham Science Centre ft_burn_min: f-value for minimum burn time - t_burn: burn time (s) (calculated if i_pulsed_plant=1) + t_plant_pulse_burn: burn time (s) (calculated if i_pulsed_plant=1) t_burn_min: minimum burn time (s) """ return ConstraintResult( 1.0 - data_structure.constraint_variables.ft_burn_min - * data_structure.times_variables.t_burn + * data_structure.times_variables.t_plant_pulse_burn / data_structure.constraint_variables.t_burn_min, data_structure.constraint_variables.t_burn_min / data_structure.constraint_variables.ft_burn_min, data_structure.constraint_variables.t_burn_min / data_structure.constraint_variables.ft_burn_min - - data_structure.times_variables.t_burn, + - data_structure.times_variables.t_plant_pulse_burn, ) diff --git a/process/costs.py b/process/costs.py index e18b6cbe91..bb10b4926f 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2867,7 +2867,7 @@ def coelc(self): * heat_transport_variables.p_plant_electric_net_mw * (24.0e0 * constants.N_DAY_YEAR) * cost_variables.cfactr - * times_variables.t_burn + * times_variables.t_plant_pulse_burn / times_variables.t_cycle ) diff --git a/process/data_structure/numerics.py b/process/data_structure/numerics.py index 03da0eb174..6e64e1ecb1 100644 --- a/process/data_structure/numerics.py +++ b/process/data_structure/numerics.py @@ -514,7 +514,7 @@ def init_numerics(): "min R0, max tau_burn ", "net electrical output ", "Null figure of merit ", - "max Q, max t_burn ", + "max Q, max t_plant_pulse_burn ", ] ncalls = 0 diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index eb0ac677b2..e1fdfa9d07 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -6,7 +6,7 @@ - =0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input - =1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up""" -t_burn: float = None +t_plant_pulse_burn: float = None """flat-top duration (s) (calculated if `i_pulsed_plant=1`)""" t_burn_0: float = None @@ -43,7 +43,7 @@ - = 1, t_current_ramp_up, t_precharge, t_ramp_down are input""" t_pulse_repetition: float = None -"""pulse length = t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down""" +"""pulse length = t_current_ramp_up + t_fusion_ramp + t_plant_pulse_burn + t_ramp_down""" t_ramp_down: float = None """time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_current_ramp_up @@ -56,7 +56,7 @@ def init_times_variables(): """Initialise plasma pulse timing variables""" global pulsetimings - global t_burn + global t_plant_pulse_burn global t_burn_0 global t_cycle global tdown @@ -72,7 +72,7 @@ def init_times_variables(): global t_precharge pulsetimings = 1.0 - t_burn = np.array(1000.0, dtype=np.float64) + t_plant_pulse_burn = np.array(1000.0, dtype=np.float64) t_burn_0 = 0.0 t_cycle = np.array(0.0, dtype=np.float64) tdown = 0.0 @@ -84,7 +84,7 @@ def init_times_variables(): "t_precharge ", "t_current_ramp_up ", "t_fusion_ramp ", - "t_burn ", + "t_plant_pulse_burn ", "t_ramp_down ", ] t_current_ramp_up = 30.0 diff --git a/process/evaluators.py b/process/evaluators.py index 265609f910..4eb8b53e35 100644 --- a/process/evaluators.py +++ b/process/evaluators.py @@ -70,7 +70,7 @@ def fcnvmc1(self, _n, m, xv, ifail): logger.debug(f"{pv.rmajor = }") logger.debug(f"{pv.p_fusion_total_mw = }") logger.debug(f"{pv.b_plasma_toroidal_on_axis = }") - logger.debug(f"{tv.t_burn = }") + logger.debug(f"{tv.t_plant_pulse_burn = }") logger.debug(f"{sqsumconfsq = }") logger.debug(f"{xv = }") diff --git a/process/input.py b/process/input.py index 12994f3ddb..7648eeac34 100644 --- a/process/input.py +++ b/process/input.py @@ -1590,7 +1590,7 @@ def __post_init__(self): "t_between_pulse": InputVariable( data_structure.times_variables, float, range=(0.0, 100000000.0) ), - "t_burn": InputVariable( + "t_plant_pulse_burn": InputVariable( data_structure.times_variables, float, range=(0.0, 100000000.0) ), "t_burn_min": InputVariable( diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index f3612f8409..4da104fadd 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -183,7 +183,7 @@ "p_plasma_separatrix_mw", "vssoft", "vs_cs_pf_total_pulse", - "t_burn", + "t_plant_pulse_burn", "b_tf_inboard_peak_symmetric", "iooic", "tmarg", diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index edd9f3774b..b8be30eee9 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -141,7 +141,7 @@ "tdwell": "t_between_pulse", "tramp": "t_precharge", "tqnch": "t_ramp_down", - "tburn": "t_burn", + "tburn": "t_plant_pulse_burn", "pdivmax/rmajor": "pdivmax_over_rmajor", "pdivtbt/qar": "pdivtbt_over_qar", "betpmx": "beta_poloidal_max", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 55756ab44d..4a5f3dfea9 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3151,7 +3151,7 @@ def plot_current_profiles_over_time( t_precharge = mfile_data.data["t_precharge"].get_scan(scan) t_current_ramp_up = mfile_data.data["t_current_ramp_up"].get_scan(scan) t_fusion_ramp = mfile_data.data["t_fusion_ramp"].get_scan(scan) - t_burn = mfile_data.data["t_burn"].get_scan(scan) + t_plant_pulse_burn = mfile_data.data["t_plant_pulse_burn"].get_scan(scan) t_ramp_down = mfile_data.data["t_ramp_down"].get_scan(scan) # Define a cumulative sum list for each point in the pulse @@ -3160,7 +3160,7 @@ def plot_current_profiles_over_time( t_precharge, t_current_ramp_up, t_fusion_ramp, - t_burn, + t_plant_pulse_burn, t_ramp_down, ]) @@ -6940,7 +6940,7 @@ def plot_magnetics_info(axis, mfile_data, scan): pf_info_3_a = "" pf_info_3_b = "" - t_burn = mfile_data.data["t_burn"].get_scan(scan) / 3600.0 + t_plant_pulse_burn = mfile_data.data["t_plant_pulse_burn"].get_scan(scan) / 3600.0 if "i_tf_bucking" in mfile_data.data: i_tf_bucking = int(mfile_data.data["i_tf_bucking"].get_scan(scan)) @@ -6979,7 +6979,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (pf_info_3_a, pf_info_3_b, "MA"), (vssoft, "Startup flux swing", "Wb"), ("vs_cs_pf_total_pulse", "Available flux swing", "Wb"), - (t_burn, "Burn time", "hrs"), + (t_plant_pulse_burn, "Burn time", "hrs"), ("", "", ""), (f"#TF coil type is {tftype}", "", ""), ("b_tf_inboard_peak_with_ripple", "Peak field at conductor (w. rip.)", "T"), @@ -7007,7 +7007,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (pf_info_3_a, pf_info_3_b, "MA"), (vssoft, "Startup flux swing", "Wb"), ("vs_cs_pf_total_pulse", "Available flux swing", "Wb"), - (t_burn, "Burn time", "hrs"), + (t_plant_pulse_burn, "Burn time", "hrs"), ("", "", ""), (f"#TF coil type is {tftype}", "", ""), ("b_tf_inboard_peak_symmetric", "Peak field at conductor (w. rip.)", "T"), diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 04d94c5411..568479c9e2 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -270,7 +270,7 @@ class VariableMetadata: "zeff": VariableMetadata( latex=r"$Z_{\mathrm{eff}}$", description="Effective charge", units="" ), - "t_burn": VariableMetadata( + "t_plant_pulse_burn": VariableMetadata( latex=r"$t_{\mathrm{burn}}$[$s$]", description="Burn time", units="s" ), "v_plasma_loop_burn": VariableMetadata( diff --git a/process/objectives.py b/process/objectives.py index 29e66386e7..65b1d977aa 100644 --- a/process/objectives.py +++ b/process/objectives.py @@ -94,14 +94,14 @@ def objective_function(minmax: int) -> float: case 11: objective_metric = current_drive_variables.p_hcd_injected_total_mw case 14: - objective_metric = times_variables.t_burn / 2.0e4 + objective_metric = times_variables.t_plant_pulse_burn / 2.0e4 case 15: if cost_variables.iavail != 1: raise ProcessValueError("minmax=15 requires iavail=1") objective_metric = cost_variables.cfactr case 16: objective_metric = 0.95 * (physics_variables.rmajor / 9.0) - 0.05 * ( - times_variables.t_burn / 7200.0 + times_variables.t_plant_pulse_burn / 7200.0 ) case 17: objective_metric = heat_transport_variables.p_plant_electric_net_mw / 500.0 @@ -110,6 +110,6 @@ def objective_function(minmax: int) -> float: case 19: objective_metric = -0.5 * ( current_drive_variables.big_q_plasma / 20.0 - ) - 0.5 * (times_variables.t_burn / 7200.0) + ) - 0.5 * (times_variables.t_plant_pulse_burn / 7200.0) return objective_sign * objective_metric diff --git a/process/pfcoil.py b/process/pfcoil.py index 45d0367798..95721e7d7e 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -139,7 +139,7 @@ def pfcoil(self): tv.t_pulse_cumulative[1] = tv.t_precharge tv.t_pulse_cumulative[2] = tv.t_pulse_cumulative[1] + tv.t_current_ramp_up tv.t_pulse_cumulative[3] = tv.t_pulse_cumulative[2] + tv.t_fusion_ramp - tv.t_pulse_cumulative[4] = tv.t_pulse_cumulative[3] + tv.t_burn + tv.t_pulse_cumulative[4] = tv.t_pulse_cumulative[3] + tv.t_plant_pulse_burn tv.t_pulse_cumulative[5] = tv.t_pulse_cumulative[4] + tv.t_ramp_down # Set up call to MHD scaling routine for coil currents. @@ -662,7 +662,7 @@ def pfcoil(self): ) ) - # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_fusion_ramp+tv.t_burn + # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_fusion_ramp+tv.t_plant_pulse_burn pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ( pfcoil_variables.ccls[nng] - ( @@ -2923,7 +2923,7 @@ def waveform(self): pfcoil_variables.c_pf_cs_coil_flat_top_ma[ic] ) - # End of flat-top, t = t_precharge + t_current_ramp_up + t_fusion_ramp + t_burn + # End of flat-top, t = t_precharge + t_current_ramp_up + t_fusion_ramp + t_plant_pulse_burn if ( abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) >= abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) diff --git a/process/physics.py b/process/physics.py index 736ae760e0..953ca6ae0c 100644 --- a/process/physics.py +++ b/process/physics.py @@ -77,7 +77,7 @@ def calculate_volt_second_requirements( res_plasma: float, plasma_current: float, t_fusion_ramp: float, - t_burn: float, + t_plant_pulse_burn: float, ind_plasma_internal_norm: float, ) -> tuple[float, float, float, float, float, float]: """Calculate the volt-second requirements and related parameters for plasma physics. @@ -100,8 +100,8 @@ def calculate_volt_second_requirements( :type plasma_current: float :param t_fusion_ramp: Heating time (s) :type t_fusion_ramp: float - :param t_burn: Burn time (s) - :type t_burn: float + :param t_plant_pulse_burn: Burn time (s) + :type t_plant_pulse_burn: float :param ind_plasma_internal_norm: Plasma normalized internal inductance :type ind_plasma_internal_norm: float @@ -174,11 +174,11 @@ def calculate_volt_second_requirements( v_burn_resistive = v_plasma_loop_burn * csawth - # N.B. t_burn on first iteration will not be correct + # N.B. t_plant_pulse_burn on first iteration will not be correct # if the pulsed reactor option is used, but the value # will be correct on subsequent calls. - vs_plasma_burn_required = v_burn_resistive * (t_fusion_ramp + t_burn) + vs_plasma_burn_required = v_burn_resistive * (t_fusion_ramp + t_plant_pulse_burn) vs_plasma_total_required = vs_plasma_ramp_required + vs_plasma_burn_required return ( @@ -1856,10 +1856,10 @@ def physics(self): # t_ramp_down = max(t_ramp_down,t_current_ramp_up) times_variables.t_ramp_down = times_variables.t_current_ramp_up - # Reset second times_variables.t_burn value (times_variables.t_burn_0). + # Reset second times_variables.t_plant_pulse_burn value (times_variables.t_burn_0). # This is used to ensure that the burn time is used consistently; # see convergence loop in fcnvmc1, evaluators.f90 - times_variables.t_burn_0 = times_variables.t_burn + times_variables.t_burn_0 = times_variables.t_plant_pulse_burn # Pulse and down times : The reactor is assumed to be 'down' # at all times outside of the plasma current flat-top period. @@ -1867,7 +1867,7 @@ def physics(self): times_variables.t_pulse_repetition = ( times_variables.t_current_ramp_up + times_variables.t_fusion_ramp - + times_variables.t_burn + + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down ) times_variables.tdown = ( @@ -1882,7 +1882,7 @@ def physics(self): times_variables.t_precharge + times_variables.t_current_ramp_up + times_variables.t_fusion_ramp - + times_variables.t_burn + + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down + times_variables.t_between_pulse ) @@ -2542,7 +2542,7 @@ def physics(self): physics_variables.res_plasma, physics_variables.plasma_current, times_variables.t_fusion_ramp, - times_variables.t_burn, + times_variables.t_plant_pulse_burn, physics_variables.ind_plasma_internal_norm, ) @@ -3875,7 +3875,11 @@ def outtim(self): times_variables.t_fusion_ramp, ) po.ovarre( - self.outfile, "Burn time (s)", "(t_burn)", times_variables.t_burn, "OP " + self.outfile, + "Burn time (s)", + "(t_plant_pulse_burn)", + times_variables.t_plant_pulse_burn, + "OP ", ) po.ovarrf( self.outfile, diff --git a/process/pulse.py b/process/pulse.py index 1a8ee8ee1c..5a7de4cfd8 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -35,7 +35,7 @@ def run(self, output: bool) -> None: # Burn time calculation - times_variables.t_burn = self.calculate_burn_time( + times_variables.t_plant_pulse_burn = self.calculate_burn_time( vs_cs_pf_total_burn=pfcoil_variables.vs_cs_pf_total_burn, v_plasma_loop_burn=physics_variables.v_plasma_loop_burn, t_fusion_ramp=times_variables.t_fusion_ramp, @@ -178,12 +178,14 @@ def calculate_burn_time( """ - t_burn = (abs(vs_cs_pf_total_burn) / v_plasma_loop_burn) - t_fusion_ramp + t_plant_pulse_burn = ( + abs(vs_cs_pf_total_burn) / v_plasma_loop_burn + ) - t_fusion_ramp - if t_burn < 0.0e0: + if t_plant_pulse_burn < 0.0e0: logger.error( "Negative burn time available; reduce t_fusion_ramp or raise PF coil V-s capabilit. " - f"{t_burn=} {vs_cs_pf_total_burn=} {v_plasma_loop_burn=} {t_fusion_ramp=}" + f"{t_plant_pulse_burn=} {vs_cs_pf_total_burn=} {v_plasma_loop_burn=} {t_fusion_ramp=}" ) - return t_burn + return t_plant_pulse_burn diff --git a/process/stellarator.py b/process/stellarator.py index 24c8d3595a..1235e1508d 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5900,12 +5900,12 @@ def stinit(): times_variables.t_precharge = 0.0 times_variables.t_current_ramp_up = 0.0 - times_variables.t_burn = 3.15576e7 # one year + times_variables.t_plant_pulse_burn = 3.15576e7 # one year times_variables.t_ramp_down = 0.0 times_variables.t_pulse_repetition = ( times_variables.t_current_ramp_up + times_variables.t_fusion_ramp - + times_variables.t_burn + + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down ) times_variables.tdown = ( @@ -5918,7 +5918,7 @@ def stinit(): times_variables.t_precharge + times_variables.t_current_ramp_up + times_variables.t_fusion_ramp - + times_variables.t_burn + + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down + times_variables.t_between_pulse ) diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 203a85feca..2e530a1ffd 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -172,7 +172,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(tfv, "t_crit_nbti", 9.04) monkeypatch.setattr(tv, "t_pulse_cumulative", np.full(6, 0.0)) monkeypatch.setattr(tv, "t_precharge", 5.0e2) - monkeypatch.setattr(tv, "t_burn", 7.1263e-1) + monkeypatch.setattr(tv, "t_plant_pulse_burn", 7.1263e-1) monkeypatch.setattr(tv, "t_current_ramp_up", 1.82538e2) monkeypatch.setattr(tv, "t_ramp_down", 1.82538e2) monkeypatch.setattr(tv, "t_fusion_ramp", 1.0e1) diff --git a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT index 3f17f8cdf9..905a1a46d7 100644 --- a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT @@ -378,7 +378,7 @@ f_vforce_inboard = 0.5 * Fraction of the total vertical force taken by the TF in *-----------------Times Variables------------------* -t_burn = 1000.0 * flat-top duration (s) (calculated if `i_pulsed_plant=1`) +t_plant_pulse_burn = 1000.0 * flat-top duration (s) (calculated if `i_pulsed_plant=1`) t_between_pulse = 100.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) *--------------------Utilities---------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index c0204e9de5..812479d0c2 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3155,7 +3155,7 @@ i_pulsed_plant = 0 * DESCRIPTION: f-value for minimum burn time * JUSTIFICATION: Used with icc=13 to enforce minimum burn time, not required -t_burn = 1000.0 +t_plant_pulse_burn = 1000.0 * DESCRIPTION: Burn Time (s) * JUSTIFICATION: Default, steady-state device so input, calculates if i_pulsed_plant = 1 diff --git a/tests/unit/test_availability.py b/tests/unit/test_availability.py index d1a6c2f2d2..cc245e4fc7 100644 --- a/tests/unit/test_availability.py +++ b/tests/unit/test_availability.py @@ -53,7 +53,7 @@ def test_avail_0(monkeypatch, availability, life_fw_fpy, ibkt_life, bktlife_exp_ monkeypatch.setattr(tv, "t_cycle", 5.0) monkeypatch.setattr(cv, "iavail", 0) monkeypatch.setattr(cv, "cfactr", 0.8) - monkeypatch.setattr(tv, "t_burn", 500.0) + monkeypatch.setattr(tv, "t_plant_pulse_burn", 500.0) monkeypatch.setattr(pv, "itart", 1) availability.avail(output=False) @@ -538,7 +538,7 @@ def mock_calc_u_unplanned_vacuum(*args, **kwargs): ) # Mock module variables - monkeypatch.setattr(tv, "t_burn", 5.0) + monkeypatch.setattr(tv, "t_plant_pulse_burn", 5.0) monkeypatch.setattr(tv, "t_cycle", 50.0) monkeypatch.setattr(ifev, "ife", 0) monkeypatch.setattr(pv, "itart", 1) @@ -583,7 +583,7 @@ def test_avail_st(monkeypatch, availability): monkeypatch.setattr(cv, "tmain", 1.0) monkeypatch.setattr(cv, "tlife", 30.0) monkeypatch.setattr(cv, "u_unplanned_cp", 0.05) - monkeypatch.setattr(tv, "t_burn", 5.0) + monkeypatch.setattr(tv, "t_plant_pulse_burn", 5.0) monkeypatch.setattr(tv, "t_cycle", 9000.0) monkeypatch.setattr(cv, "adivflnc", 10.0) monkeypatch.setattr(dv, "pflux_div_heat_load_mw", 10.0) diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 4d8a40b9dc..6dfce10b46 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -5617,7 +5617,7 @@ class CoelcParam(NamedTuple): t_cycle: Any = None - t_burn: Any = None + t_plant_pulse_burn: Any = None outfile: Any = None @@ -5712,7 +5712,7 @@ class CoelcParam(NamedTuple): wtgpd=507.88376577416528, f_plasma_fuel_helium3=0, t_cycle=10864.426139387357, - t_burn=0, + t_plant_pulse_burn=0, outfile=11, expected_coeoam=4.4099029328740929e20, expected_coecap=4.9891775218979061e21, @@ -5796,7 +5796,7 @@ class CoelcParam(NamedTuple): wtgpd=507.72524666099866, f_plasma_fuel_helium3=0, t_cycle=864.42613938735622, - t_burn=10230.533336387549, + t_plant_pulse_burn=10230.533336387549, outfile=11, expected_coeoam=1.2419424614419636, expected_coecap=15.547404530833255, @@ -5918,7 +5918,9 @@ def test_coelc(coelcparam, monkeypatch, costs): monkeypatch.setattr(times_variables, "t_cycle", coelcparam.t_cycle) - monkeypatch.setattr(times_variables, "t_burn", coelcparam.t_burn) + monkeypatch.setattr( + times_variables, "t_plant_pulse_burn", coelcparam.t_plant_pulse_burn + ) costs.coelc() diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 42dcefb43c..6cb43c8f86 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -2014,7 +2014,7 @@ class VoltSecondReqParam(NamedTuple): res_plasma: Any = None - t_burn: Any = None + t_plant_pulse_burn: Any = None t_fusion_ramp: Any = None @@ -2048,7 +2048,7 @@ class VoltSecondReqParam(NamedTuple): ind_plasma_internal_norm=1.2064840230894305, rmajor=8, res_plasma=3.7767895536275952e-09, - t_burn=1000, + t_plant_pulse_burn=1000, t_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, expected_ind_plasma=1.4075705307248088e-05, @@ -2069,7 +2069,7 @@ class VoltSecondReqParam(NamedTuple): ind_plasma_internal_norm=1.2064840230894305, rmajor=8, res_plasma=3.7767895536275952e-09, - t_burn=0, + t_plant_pulse_burn=0, t_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, expected_ind_plasma=1.4075705307248088e-05, @@ -2111,7 +2111,7 @@ def test_vscalc(voltsecondreqparam): ind_plasma_internal_norm=voltsecondreqparam.ind_plasma_internal_norm, rmajor=voltsecondreqparam.rmajor, res_plasma=voltsecondreqparam.res_plasma, - t_burn=voltsecondreqparam.t_burn, + t_plant_pulse_burn=voltsecondreqparam.t_plant_pulse_burn, t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, ) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 49b03f1d9c..354253e750 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -974,7 +974,7 @@ class PfpwrParam(NamedTuple): "t_precharge ", "t_current_ramp_up ", "t_fusion_ramp ", - "t_burn ", + "t_plant_pulse_burn ", "t_ramp_down ", ), timelabel=( @@ -1717,7 +1717,7 @@ class PfpwrParam(NamedTuple): "t_precharge ", "t_current_ramp_up ", "t_fusion_ramp ", - "t_burn ", + "t_plant_pulse_burn ", "t_ramp_down ", ), timelabel=( diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 3773a4fe8e..39bab08b68 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -152,7 +152,7 @@ class ProcessTracker: "TFCoil.b_tf_inboard_peak_symmetric", "PFCoil.vs_cs_pf_total_pulse", "Physics.nd_plasma_ions_total_vol_avg", - "Time.t_burn", + "Time.t_plant_pulse_burn", "Cost.divlife", "Cost.cdirt", "Cost.concost", From ef2af6f48bef386a928f52336b017109e062fe20 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 14:55:42 +0100 Subject: [PATCH 02/13] =?UTF-8?q?=F0=9F=94=84=20-=20Rename=20`t=5Ffusion?= =?UTF-8?q?=5Framp`=20to=20`t=5Fplant=5Fpulse=5Ffusion=5Framp`=20across=20?= =?UTF-8?q?multiple=20files=20to=20reflect=20updated=20terminology.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/physics-models/pulsed-plant.md | 2 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 2 +- examples/data/large_tokamak_nof_MFILE.DAT | 2 +- process/data_structure/times_variables.py | 10 +++++----- process/input.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 6 ++++-- process/pfcoil.py | 8 +++++--- process/physics.py | 20 +++++++++++--------- process/pulse.py | 14 +++++++------- process/stellarator.py | 4 ++-- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/test_physics.py | 8 ++++---- tests/unit/test_power.py | 4 ++-- tests/unit/test_pulse.py | 6 +++--- 15 files changed, 49 insertions(+), 43 deletions(-) diff --git a/documentation/physics-models/pulsed-plant.md b/documentation/physics-models/pulsed-plant.md index 9a6c3058d3..fcdb5ba595 100644 --- a/documentation/physics-models/pulsed-plant.md +++ b/documentation/physics-models/pulsed-plant.md @@ -57,7 +57,7 @@ Over the course of a pulse, the timings are detailed as: - Precharge (`t_precharge`) - the CS current ramps from zero to maximum value. The other PF coils also ramp from zero to their required values. - Current ramp-up (`t_current_ramp_up`) - The plasma current ramps up to approx full value. Auxiliary heating is possibly on. -- Fusion ramp (`t_fusion_ramp`) - The plasma temperature and density rise to the full values. The CS and other PF coil currents all change steadily. Auxiliary heating is on. +- Fusion ramp (`t_plant_pulse_fusion_ramp`) - The plasma temperature and density rise to the full values. The CS and other PF coil currents all change steadily. Auxiliary heating is on. - Burn time (`t_plant_pulse_burn`) - Flat-top duration. The plasma is approximately steady. Fusion power and electricity are produced. The CS and other PF coil currents all change steadily in a pulsed reactor, but are constant for a "steady-state" reactor. Auxiliary heating is on. - Ramp-down (`t_ramp_down`) - The plasma current, density and temperature all ramp down to zero simultaneously. As a starter for ten we could assume that the CS and PF coil currents also ramp to zero at the same time. Auxiliary heating is possibly on. - Between pulse (`t_between_pulse`) - CS and PF coil currents are zero - a few minutes may be required to permit vacuum pumping. May be much longer for an experimental device such as DEMO. diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index 3b0b502662..1d8ecb3db8 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -452,7 +452,7 @@ # Times # Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.60910954080422698e+02 - Heating_time_(s)_________________________________________________________ (t_fusion_ramp)________________ 1.00000000000000000e+01 + Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.60910954080422698e+02 Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index 8238b7c88e..23b643b0ad 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -526,7 +526,7 @@ # Times # Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.75262350092394996e+02 - Heating_time_(s)_________________________________________________________ (t_fusion_ramp)________________ 1.00000000000000000e+01 + Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.75262350092394996e+02 Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index e1fdfa9d07..723993cd59 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -21,7 +21,7 @@ t_between_pulse: float = None """time between pulses in a pulsed reactor (s) (`iteration variable 17`)""" -t_fusion_ramp: float = None +t_plant_pulse_fusion_ramp: float = None """time for plasma temperature and density rise to full values (s)""" t_pulse_cumulative: list[float] = None @@ -43,7 +43,7 @@ - = 1, t_current_ramp_up, t_precharge, t_ramp_down are input""" t_pulse_repetition: float = None -"""pulse length = t_current_ramp_up + t_fusion_ramp + t_plant_pulse_burn + t_ramp_down""" +"""pulse length = t_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + t_ramp_down""" t_ramp_down: float = None """time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_current_ramp_up @@ -61,7 +61,7 @@ def init_times_variables(): global t_cycle global tdown global t_between_pulse - global t_fusion_ramp + global t_plant_pulse_fusion_ramp global t_pulse_cumulative global timelabel global intervallabel @@ -77,13 +77,13 @@ def init_times_variables(): t_cycle = np.array(0.0, dtype=np.float64) tdown = 0.0 t_between_pulse = 1800.0 - t_fusion_ramp = 10.0 + t_plant_pulse_fusion_ramp = 10.0 t_pulse_cumulative = np.zeros(6, dtype=np.float64) timelabel = ["Start", "BOP ", "EOR ", "BOF ", "EOF ", "EOP "] intervallabel = [ "t_precharge ", "t_current_ramp_up ", - "t_fusion_ramp ", + "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", "t_ramp_down ", ] diff --git a/process/input.py b/process/input.py index 7648eeac34..745017a34a 100644 --- a/process/input.py +++ b/process/input.py @@ -1611,7 +1611,7 @@ def __post_init__(self): "t_current_ramp_up": InputVariable( data_structure.times_variables, float, range=(0.0, 10000.0) ), - "t_fusion_ramp": InputVariable( + "t_plant_pulse_fusion_ramp": InputVariable( data_structure.times_variables, float, range=(0.0, 10000.0) ), "t_in_bb": InputVariable( diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index b8be30eee9..3525ef36f5 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -116,7 +116,7 @@ "idhe3": "f_plasma_fuel_helium3", "blnktth": None, "dz_blkt_upper": None, - "theat": "t_fusion_ramp", + "theat": "t_plant_pulse_fusion_ramp", "ieped": None, "eped_sf": None, "icurr": "i_plasma_current", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 4a5f3dfea9..85e19057c0 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3150,7 +3150,9 @@ def plot_current_profiles_over_time( """ t_precharge = mfile_data.data["t_precharge"].get_scan(scan) t_current_ramp_up = mfile_data.data["t_current_ramp_up"].get_scan(scan) - t_fusion_ramp = mfile_data.data["t_fusion_ramp"].get_scan(scan) + t_plant_pulse_fusion_ramp = mfile_data.data["t_plant_pulse_fusion_ramp"].get_scan( + scan + ) t_plant_pulse_burn = mfile_data.data["t_plant_pulse_burn"].get_scan(scan) t_ramp_down = mfile_data.data["t_ramp_down"].get_scan(scan) @@ -3159,7 +3161,7 @@ def plot_current_profiles_over_time( 0, t_precharge, t_current_ramp_up, - t_fusion_ramp, + t_plant_pulse_fusion_ramp, t_plant_pulse_burn, t_ramp_down, ]) diff --git a/process/pfcoil.py b/process/pfcoil.py index 95721e7d7e..b463e8d4e1 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -138,7 +138,9 @@ def pfcoil(self): tv.t_pulse_cumulative[0] = 0.0e0 tv.t_pulse_cumulative[1] = tv.t_precharge tv.t_pulse_cumulative[2] = tv.t_pulse_cumulative[1] + tv.t_current_ramp_up - tv.t_pulse_cumulative[3] = tv.t_pulse_cumulative[2] + tv.t_fusion_ramp + tv.t_pulse_cumulative[3] = ( + tv.t_pulse_cumulative[2] + tv.t_plant_pulse_fusion_ramp + ) tv.t_pulse_cumulative[4] = tv.t_pulse_cumulative[3] + tv.t_plant_pulse_burn tv.t_pulse_cumulative[5] = tv.t_pulse_cumulative[4] + tv.t_ramp_down @@ -662,7 +664,7 @@ def pfcoil(self): ) ) - # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_fusion_ramp+tv.t_plant_pulse_burn + # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_plant_pulse_fusion_ramp+tv.t_plant_pulse_burn pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ( pfcoil_variables.ccls[nng] - ( @@ -2923,7 +2925,7 @@ def waveform(self): pfcoil_variables.c_pf_cs_coil_flat_top_ma[ic] ) - # End of flat-top, t = t_precharge + t_current_ramp_up + t_fusion_ramp + t_plant_pulse_burn + # End of flat-top, t = t_precharge + t_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn if ( abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) >= abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) diff --git a/process/physics.py b/process/physics.py index 953ca6ae0c..404b376dc8 100644 --- a/process/physics.py +++ b/process/physics.py @@ -76,7 +76,7 @@ def calculate_volt_second_requirements( rmajor: float, res_plasma: float, plasma_current: float, - t_fusion_ramp: float, + t_plant_pulse_fusion_ramp: float, t_plant_pulse_burn: float, ind_plasma_internal_norm: float, ) -> tuple[float, float, float, float, float, float]: @@ -98,8 +98,8 @@ def calculate_volt_second_requirements( :type res_plasma: float :param plasma_current: Plasma current (A) :type plasma_current: float - :param t_fusion_ramp: Heating time (s) - :type t_fusion_ramp: float + :param t_plant_pulse_fusion_ramp: Heating time (s) + :type t_plant_pulse_fusion_ramp: float :param t_plant_pulse_burn: Burn time (s) :type t_plant_pulse_burn: float :param ind_plasma_internal_norm: Plasma normalized internal inductance @@ -178,7 +178,9 @@ def calculate_volt_second_requirements( # if the pulsed reactor option is used, but the value # will be correct on subsequent calls. - vs_plasma_burn_required = v_burn_resistive * (t_fusion_ramp + t_plant_pulse_burn) + vs_plasma_burn_required = v_burn_resistive * ( + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + ) vs_plasma_total_required = vs_plasma_ramp_required + vs_plasma_burn_required return ( @@ -1866,7 +1868,7 @@ def physics(self): # The pulse length is the duration of non-zero plasma current times_variables.t_pulse_repetition = ( times_variables.t_current_ramp_up - + times_variables.t_fusion_ramp + + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down ) @@ -1881,7 +1883,7 @@ def physics(self): times_variables.t_cycle = ( times_variables.t_precharge + times_variables.t_current_ramp_up - + times_variables.t_fusion_ramp + + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down + times_variables.t_between_pulse @@ -2541,7 +2543,7 @@ def physics(self): physics_variables.rmajor, physics_variables.res_plasma, physics_variables.plasma_current, - times_variables.t_fusion_ramp, + times_variables.t_plant_pulse_fusion_ramp, times_variables.t_plant_pulse_burn, physics_variables.ind_plasma_internal_norm, ) @@ -3871,8 +3873,8 @@ def outtim(self): po.ovarrf( self.outfile, "Heating time (s)", - "(t_fusion_ramp)", - times_variables.t_fusion_ramp, + "(t_plant_pulse_fusion_ramp)", + times_variables.t_plant_pulse_fusion_ramp, ) po.ovarre( self.outfile, diff --git a/process/pulse.py b/process/pulse.py index 5a7de4cfd8..46bb439ab1 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -38,7 +38,7 @@ def run(self, output: bool) -> None: times_variables.t_plant_pulse_burn = self.calculate_burn_time( vs_cs_pf_total_burn=pfcoil_variables.vs_cs_pf_total_burn, v_plasma_loop_burn=physics_variables.v_plasma_loop_burn, - t_fusion_ramp=times_variables.t_fusion_ramp, + t_plant_pulse_fusion_ramp=times_variables.t_plant_pulse_fusion_ramp, ) def tohswg(self, output: bool) -> None: @@ -155,7 +155,7 @@ def calculate_burn_time( self, vs_cs_pf_total_burn: float, v_plasma_loop_burn: float, - t_fusion_ramp: float, + t_plant_pulse_fusion_ramp: float, ) -> float: """ Calculate the burn time for a pulsed reactor. @@ -169,8 +169,8 @@ def calculate_burn_time( :type vs_cs_pf_total_burn: float :param v_plasma_loop_burn: Plasma loop voltage during burn (V) :type v_plasma_loop_burn: float - :param t_fusion_ramp: Time for fusion ramp (s) - :type t_fusion_ramp: float + :param t_plant_pulse_fusion_ramp: Time for fusion ramp (s) + :type t_plant_pulse_fusion_ramp: float :return: Calculated burn time (s) :rtype: float @@ -180,12 +180,12 @@ def calculate_burn_time( t_plant_pulse_burn = ( abs(vs_cs_pf_total_burn) / v_plasma_loop_burn - ) - t_fusion_ramp + ) - t_plant_pulse_fusion_ramp if t_plant_pulse_burn < 0.0e0: logger.error( - "Negative burn time available; reduce t_fusion_ramp or raise PF coil V-s capabilit. " - f"{t_plant_pulse_burn=} {vs_cs_pf_total_burn=} {v_plasma_loop_burn=} {t_fusion_ramp=}" + "Negative burn time available; reduce t_plant_pulse_fusion_ramp or raise PF coil V-s capabilit. " + f"{t_plant_pulse_burn=} {vs_cs_pf_total_burn=} {v_plasma_loop_burn=} {t_plant_pulse_fusion_ramp=}" ) return t_plant_pulse_burn diff --git a/process/stellarator.py b/process/stellarator.py index 1235e1508d..8b6f0cd685 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5904,7 +5904,7 @@ def stinit(): times_variables.t_ramp_down = 0.0 times_variables.t_pulse_repetition = ( times_variables.t_current_ramp_up - + times_variables.t_fusion_ramp + + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down ) @@ -5917,7 +5917,7 @@ def stinit(): times_variables.t_cycle = ( times_variables.t_precharge + times_variables.t_current_ramp_up - + times_variables.t_fusion_ramp + + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down + times_variables.t_between_pulse diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 2e530a1ffd..404bb1565f 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -175,7 +175,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(tv, "t_plant_pulse_burn", 7.1263e-1) monkeypatch.setattr(tv, "t_current_ramp_up", 1.82538e2) monkeypatch.setattr(tv, "t_ramp_down", 1.82538e2) - monkeypatch.setattr(tv, "t_fusion_ramp", 1.0e1) + monkeypatch.setattr(tv, "t_plant_pulse_fusion_ramp", 1.0e1) monkeypatch.setattr(constants, "den_copper", 8.9e3) monkeypatch.setattr(pfcoil_variables, "first_call", True) diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py index 6cb43c8f86..49e2e59fb2 100644 --- a/tests/unit/test_physics.py +++ b/tests/unit/test_physics.py @@ -2016,7 +2016,7 @@ class VoltSecondReqParam(NamedTuple): t_plant_pulse_burn: Any = None - t_fusion_ramp: Any = None + t_plant_pulse_fusion_ramp: Any = None expected_vs_plasma_internal: Any = None @@ -2049,7 +2049,7 @@ class VoltSecondReqParam(NamedTuple): rmajor=8, res_plasma=3.7767895536275952e-09, t_plant_pulse_burn=1000, - t_fusion_ramp=10, + t_plant_pulse_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, expected_ind_plasma=1.4075705307248088e-05, expected_vs_plasma_burn_required=42.109179697761263, @@ -2070,7 +2070,7 @@ class VoltSecondReqParam(NamedTuple): rmajor=8, res_plasma=3.7767895536275952e-09, t_plant_pulse_burn=0, - t_fusion_ramp=10, + t_plant_pulse_fusion_ramp=10, expected_vs_plasma_internal=111.57651734747576, expected_ind_plasma=1.4075705307248088e-05, expected_vs_plasma_burn_required=0.41692257126496302, @@ -2112,7 +2112,7 @@ def test_vscalc(voltsecondreqparam): rmajor=voltsecondreqparam.rmajor, res_plasma=voltsecondreqparam.res_plasma, t_plant_pulse_burn=voltsecondreqparam.t_plant_pulse_burn, - t_fusion_ramp=voltsecondreqparam.t_fusion_ramp, + t_plant_pulse_fusion_ramp=voltsecondreqparam.t_plant_pulse_fusion_ramp, ) assert vs_plasma_internal == pytest.approx( diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 354253e750..1f09fb38b0 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -973,7 +973,7 @@ class PfpwrParam(NamedTuple): intervallabel=( "t_precharge ", "t_current_ramp_up ", - "t_fusion_ramp ", + "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", "t_ramp_down ", ), @@ -1716,7 +1716,7 @@ class PfpwrParam(NamedTuple): intervallabel=( "t_precharge ", "t_current_ramp_up ", - "t_fusion_ramp ", + "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", "t_ramp_down ", ), diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index fda40d6722..abbcfc9daf 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -1250,7 +1250,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): @pytest.mark.parametrize( - "vs_cs_pf_total_burn, v_plasma_loop_burn, t_fusion_ramp, expected", + "vs_cs_pf_total_burn, v_plasma_loop_burn, t_plant_pulse_fusion_ramp, expected", [ (100.0, 10.0, 2.0, 8.0), (-100.0, 10.0, 2.0, 8.0), # abs() should be used @@ -1260,13 +1260,13 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): def test_calculate_burn_time_valid( vs_cs_pf_total_burn, v_plasma_loop_burn, - t_fusion_ramp, + t_plant_pulse_fusion_ramp, expected, ): pulse = Pulse() result = pulse.calculate_burn_time( vs_cs_pf_total_burn=vs_cs_pf_total_burn, v_plasma_loop_burn=v_plasma_loop_burn, - t_fusion_ramp=t_fusion_ramp, + t_plant_pulse_fusion_ramp=t_plant_pulse_fusion_ramp, ) assert result == expected From 5abe1edaca5fb38cdd88a4142d112a4124799cce Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 15:00:08 +0100 Subject: [PATCH 03/13] =?UTF-8?q?=F0=9F=94=84=20-=20Updated=20variable=20n?= =?UTF-8?q?ames=20related=20to=20initial=20charge=20time=20for=20the=20cen?= =?UTF-8?q?tral=20solenoid=20(CS)=20from=20`t=5Fprecharge`=20to=20`t=5Fpla?= =?UTF-8?q?nt=5Fpulse=5Fcoil=5Fprecharge`=20across=20multiple=20data=20fil?= =?UTF-8?q?es=20and=20code=20modules.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/physics-models/pulsed-plant.md | 4 ++-- .../data/csv_output_large_tokamak_MFILE.DAT | 6 +++--- examples/data/large_tokamak_1_MFILE.DAT | 6 +++--- examples/data/large_tokamak_2_MFILE.DAT | 6 +++--- examples/data/large_tokamak_3_MFILE.DAT | 6 +++--- examples/data/large_tokamak_4_MFILE.DAT | 6 +++--- examples/data/large_tokamak_eval_IN.DAT | 2 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 6 +++--- examples/data/large_tokamak_nof_MFILE.DAT | 6 +++--- process/data_structure/times_variables.py | 16 ++++++++-------- process/data_structure/vacuum_variables.py | 4 ++-- process/input.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 6 ++++-- process/pfcoil.py | 14 +++++++------- process/physics.py | 19 +++++++++++-------- process/power.py | 2 +- process/stellarator.py | 6 +++--- process/vacuum.py | 8 ++++---- .../data/large_tokamak_eval.IN.DAT | 2 +- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_eval.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 14 +++++++------- tests/unit/test_power.py | 4 ++-- tests/unit/test_vacuum.py | 2 +- 27 files changed, 81 insertions(+), 76 deletions(-) diff --git a/documentation/physics-models/pulsed-plant.md b/documentation/physics-models/pulsed-plant.md index fcdb5ba595..7cf59a7f75 100644 --- a/documentation/physics-models/pulsed-plant.md +++ b/documentation/physics-models/pulsed-plant.md @@ -31,7 +31,7 @@ but this is not taken ito account. In the steady-state scenario (`i_pulsed_plant` = 0), the plasma current ramp-up time `t_current_ramp_up` is determined as follows. -- If `i_t_current_ramp_up` = 0, the rate of change of plasma current is 0.5 MA/s. The PF coil ramp time `t_precharge` +- If `i_t_current_ramp_up` = 0, the rate of change of plasma current is 0.5 MA/s. The PF coil ramp time `t_plant_pulse_coil_precharge` and shutdown time `t_ramp_down` are (arbitrarily) set equal to `t_current_ramp_up`. - If `i_t_current_ramp_up` $\neq$ 0, the plasma current ramp-up time `t_current_ramp_up`, and the PF coil ramp and shutdown times are input parameters. @@ -55,7 +55,7 @@ constraint equation no. 13 and iteration variable no 21 (`ft_burn_min`). Over the course of a pulse, the timings are detailed as: -- Precharge (`t_precharge`) - the CS current ramps from zero to maximum value. The other PF coils also ramp from zero to their required values. +- Precharge (`t_plant_pulse_coil_precharge`) - the CS current ramps from zero to maximum value. The other PF coils also ramp from zero to their required values. - Current ramp-up (`t_current_ramp_up`) - The plasma current ramps up to approx full value. Auxiliary heating is possibly on. - Fusion ramp (`t_plant_pulse_fusion_ramp`) - The plasma temperature and density rise to the full values. The CS and other PF coil currents all change steadily. Auxiliary heating is on. - Burn time (`t_plant_pulse_burn`) - Flat-top duration. The plasma is approximately steady. Fusion power and electricity are produced. The CS and other PF coil currents all change steadily in a pulsed reactor, but are constant for a "steady-state" reactor. Auxiliary heating is on. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 76babf417a..7382d04e21 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -557,7 +557,7 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8401E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.8571E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6699E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.1999E+03 OP @@ -1049,7 +1049,7 @@ Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6766E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6929E+01 OP @@ -1637,7 +1637,7 @@ t_between_pulse = 1800.0 pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index dc844938b1..833f2cfc01 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -555,7 +555,7 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP @@ -1044,7 +1044,7 @@ Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1631,7 +1631,7 @@ t_between_pulse = 1800.0 pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 11c88dd4a7..06b0e64e6e 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -555,7 +555,7 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP @@ -1044,7 +1044,7 @@ Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1631,7 +1631,7 @@ t_between_pulse = 1800.0 pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index bc77160b1e..e42985d268 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -555,7 +555,7 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP @@ -1044,7 +1044,7 @@ Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1632,7 +1632,7 @@ t_between_pulse = 1800.0 pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 89a1d0171b..4599d8eb7e 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -555,7 +555,7 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP @@ -1044,7 +1044,7 @@ Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1632,7 +1632,7 @@ t_between_pulse = 1800.0 pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_eval_IN.DAT b/examples/data/large_tokamak_eval_IN.DAT index 710bf55d8c..87e84a7d03 100644 --- a/examples/data/large_tokamak_eval_IN.DAT +++ b/examples/data/large_tokamak_eval_IN.DAT @@ -393,7 +393,7 @@ f_a_tf_turn_cable_space_extra_void = 0.3 * coolant fraction of TFC 'cable' ( pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up *--------------------Utilities---------------------* diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index 1d8ecb3db8..94303a2047 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -450,7 +450,7 @@ Required_volt-seconds_during_start-up_(Wb)_______________________________ (vssoft)_______________________ 2.97897067240026217e+02 Available_volt-seconds_during_burn_(Wb)__________________________________ (vsmax)________________________ 2.62897202405171981e+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_precharge)__________________ 5.00000000000000000e+02 + Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_prechargese_coil_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.60910954080422698e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP @@ -1000,7 +1000,7 @@ Chamber_pressure_before_burn_(Pa)________________________________________ (pstart)_______________________ 1.61381834730617638e-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 Dwell_time_between_burns_(s)_____________________________________________ (t_between_pulse.)_____________ 1.80000000000000000e+03 - CS_ramp-up_time_burns_(s)________________________________________________ (t_precharge.)_________________ 5.00000000000000000e+02 + CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)_________________ 5.00000000000000000e+02 Allowable_pumping_time_between_burns_(s)_________________________________ (tpump)________________________ 1.80000000000000000e+03 Required_D-T_pump_speed_(m3/s)___________________________________________ (s(2))_________________________ 5.77897305930929406e+00 OP D-T_pump_speed_provided_(m3/s)___________________________________________ (snet(2))______________________ 8.05842119672848440e+01 OP @@ -1573,7 +1573,7 @@ f_a_tf_turn_cable_space_extra_void = 0.3 * coolant fraction of TFC 'cable' ( pulsetimings = 0 * Switch for pulse timings (if lpulse=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up *--------------------Utilities---------------------* diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index 23b643b0ad..493b81ed6e 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -524,7 +524,7 @@ Required_volt-seconds_during_start-up_(Wb)_______________________________ (vssoft)_______________________ 3.10133419793858025e+02 Available_volt-seconds_during_burn_(Wb)__________________________________ (vsmax)________________________ 2.83743882145049042e+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_precharge)__________________ 5.00000000000000000e+02 + Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_prechargese_coil_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.75262350092394996e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP @@ -1074,7 +1074,7 @@ Chamber_pressure_before_burn_(Pa)________________________________________ (pstart)_______________________ 1.75966345086182841e-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 Dwell_time_between_burns_(s)_____________________________________________ (t_between_pulse.)_____________ 1.80000000000000000e+03 - CS_ramp-up_time_burns_(s)________________________________________________ (t_precharge.)_________________ 5.00000000000000000e+02 + CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)_________________ 5.00000000000000000e+02 Allowable_pumping_time_between_burns_(s)_________________________________ (tpump)________________________ 1.80000000000000000e+03 Required_D-T_pump_speed_(m3/s)___________________________________________ (s(2))_________________________ 5.77897305930929495e+00 OP D-T_pump_speed_provided_(m3/s)___________________________________________ (snet(2))______________________ 4.85613085971767617e+01 OP @@ -1641,7 +1641,7 @@ t_between_pulse = 1800.0 pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index 723993cd59..ff3f3b26e0 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -3,8 +3,8 @@ pulsetimings: float = None """Switch for pulse timings (if i_pulsed_plant=1): - - =0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input - - =1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up""" + - =0, t_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_ramp_down = input + - =1, t_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_ramp_down max of input or t_current_ramp_up""" t_plant_pulse_burn: float = None """flat-top duration (s) (calculated if `i_pulsed_plant=1`)""" @@ -39,8 +39,8 @@ i_t_current_ramp_up: int = None """Switch for plasma current ramp-up time (if i_pulsed_plant=0): - - = 0, t_current_ramp_up = t_precharge = t_ramp_down = Ip(MA)/0.5 - - = 1, t_current_ramp_up, t_precharge, t_ramp_down are input""" + - = 0, t_current_ramp_up = t_plant_pulse_coil_precharge = t_ramp_down = Ip(MA)/0.5 + - = 1, t_current_ramp_up, t_plant_pulse_coil_precharge, t_ramp_down are input""" t_pulse_repetition: float = None """pulse length = t_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + t_ramp_down""" @@ -49,7 +49,7 @@ """time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_current_ramp_up the CS and PF coil currents also ramp to zero at the same time""" -t_precharge: float = None +t_plant_pulse_coil_precharge: float = None """the time for the central solenoid and PF coils to ramp from zero to max current (s); if pulsed, = t_current_ramp_up""" @@ -69,7 +69,7 @@ def init_times_variables(): global i_t_current_ramp_up global t_pulse_repetition global t_ramp_down - global t_precharge + global t_plant_pulse_coil_precharge pulsetimings = 1.0 t_plant_pulse_burn = np.array(1000.0, dtype=np.float64) @@ -81,7 +81,7 @@ def init_times_variables(): t_pulse_cumulative = np.zeros(6, dtype=np.float64) timelabel = ["Start", "BOP ", "EOR ", "BOF ", "EOF ", "EOP "] intervallabel = [ - "t_precharge ", + "t_plant_pulse_coil_precharge ", "t_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", @@ -91,4 +91,4 @@ def init_times_variables(): i_t_current_ramp_up = 0 t_pulse_repetition = 0.0 t_ramp_down = 15.0 - t_precharge = 15.0 + t_plant_pulse_coil_precharge = 15.0 diff --git a/process/data_structure/vacuum_variables.py b/process/data_structure/vacuum_variables.py index ce6046ed05..b9a45ada79 100644 --- a/process/data_structure/vacuum_variables.py +++ b/process/data_structure/vacuum_variables.py @@ -54,8 +54,8 @@ """switch for dwell pumping options: - =0 pumping only during t_between_pulse - - =1 pumping only during t_precharge - - =2 pumping during t_between_pulse + t_precharge + - =1 pumping only during t_plant_pulse_coil_precharge + - =2 pumping during t_between_pulse + t_plant_pulse_coil_precharge The following are used in the Battes, Day and Rohde pump-down model See "Basic considerations on the pump-down time in the dwell phase of a pulsed fusion DEMO" diff --git a/process/input.py b/process/input.py index 745017a34a..60a6880d37 100644 --- a/process/input.py +++ b/process/input.py @@ -1623,7 +1623,7 @@ def __post_init__(self): "t_out_bb": InputVariable( data_structure.primary_pumping_variables, float, range=(200.0, 1000.0) ), - "t_precharge": InputVariable( + "t_plant_pulse_coil_precharge": InputVariable( data_structure.times_variables, float, range=(0.0, 10000.0) ), "t_ramp_down": InputVariable( diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 3525ef36f5..5afe8866e3 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -139,7 +139,7 @@ "tbrnmn": "t_burn_min", "tohs": "t_current_ramp_up", "tdwell": "t_between_pulse", - "tramp": "t_precharge", + "tramp": "t_plant_pulse_coil_precharge", "tqnch": "t_ramp_down", "tburn": "t_plant_pulse_burn", "pdivmax/rmajor": "pdivmax_over_rmajor", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 85e19057c0..82b1d0740f 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3148,7 +3148,9 @@ def plot_current_profiles_over_time( mfile_data (mf.MFile): MFILE data object. scan (int): Scan number to use. """ - t_precharge = mfile_data.data["t_precharge"].get_scan(scan) + t_plant_pulse_coil_precharge = mfile_data.data[ + "t_plant_pulse_coil_precharge" + ].get_scan(scan) t_current_ramp_up = mfile_data.data["t_current_ramp_up"].get_scan(scan) t_plant_pulse_fusion_ramp = mfile_data.data["t_plant_pulse_fusion_ramp"].get_scan( scan @@ -3159,7 +3161,7 @@ def plot_current_profiles_over_time( # Define a cumulative sum list for each point in the pulse t_steps = np.cumsum([ 0, - t_precharge, + t_plant_pulse_coil_precharge, t_current_ramp_up, t_plant_pulse_fusion_ramp, t_plant_pulse_burn, diff --git a/process/pfcoil.py b/process/pfcoil.py index b463e8d4e1..692adb8bdf 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -136,7 +136,7 @@ def pfcoil(self): # Set up array of times tv.t_pulse_cumulative[0] = 0.0e0 - tv.t_pulse_cumulative[1] = tv.t_precharge + tv.t_pulse_cumulative[1] = tv.t_plant_pulse_coil_precharge tv.t_pulse_cumulative[2] = tv.t_pulse_cumulative[1] + tv.t_current_ramp_up tv.t_pulse_cumulative[3] = ( tv.t_pulse_cumulative[2] + tv.t_plant_pulse_fusion_ramp @@ -649,12 +649,12 @@ def pfcoil(self): pfcoil_variables.ccl0[nng] = 1.0e6 * pfcoil_variables.ccl0_ma[nng] pfcoil_variables.ccls[nng] = 1.0e6 * pfcoil_variables.ccls_ma[nng] - # Beginning of pulse: t = tv.t_precharge + # Beginning of pulse: t = tv.t_plant_pulse_coil_precharge pfcoil_variables.c_pf_cs_coil_pulse_start_ma[ncl] = ( 1.0e-6 * pfcoil_variables.ccl0[nng] ) - # Beginning of flat-top: t = tv.t_precharge+tv.t_current_ramp_up + # Beginning of flat-top: t = tv.t_plant_pulse_coil_precharge+tv.t_current_ramp_up pfcoil_variables.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ( pfcoil_variables.ccls[nng] - ( @@ -664,7 +664,7 @@ def pfcoil(self): ) ) - # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_plant_pulse_fusion_ramp+tv.t_plant_pulse_burn + # End of flat-top: t = tv.t_plant_pulse_coil_precharge+tv.t_current_ramp_up+tv.t_plant_pulse_fusion_ramp+tv.t_plant_pulse_burn pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ( pfcoil_variables.ccls[nng] - ( @@ -2901,7 +2901,7 @@ def waveform(self): for ic in range(pfcoil_variables.n_cs_pf_coils): # Find where the peak current occurs - # Beginning of pulse, t = t_precharge + # Beginning of pulse, t = t_plant_pulse_coil_precharge if ( abs(pfcoil_variables.c_pf_cs_coil_pulse_start_ma[ic]) >= abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) @@ -2913,7 +2913,7 @@ def waveform(self): pfcoil_variables.c_pf_cs_coil_pulse_start_ma[ic] ) - # Beginning of flat-top, t = t_precharge + t_current_ramp_up + # Beginning of flat-top, t = t_plant_pulse_coil_precharge + t_current_ramp_up if ( abs(pfcoil_variables.c_pf_cs_coil_flat_top_ma[ic]) >= abs(pfcoil_variables.c_pf_cs_coil_pulse_start_ma[ic]) @@ -2925,7 +2925,7 @@ def waveform(self): pfcoil_variables.c_pf_cs_coil_flat_top_ma[ic] ) - # End of flat-top, t = t_precharge + t_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + # End of flat-top, t = t_plant_pulse_coil_precharge + t_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn if ( abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) >= abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) diff --git a/process/physics.py b/process/physics.py index 404b376dc8..d546bd9bc6 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1838,12 +1838,14 @@ def physics(self): times_variables.t_current_ramp_up = ( physics_variables.plasma_current / 5.0e5 ) - times_variables.t_precharge = times_variables.t_current_ramp_up + times_variables.t_plant_pulse_coil_precharge = ( + times_variables.t_current_ramp_up + ) times_variables.t_ramp_down = times_variables.t_current_ramp_up else: if times_variables.pulsetimings == 0.0e0: - # times_variables.t_precharge is input + # times_variables.t_plant_pulse_coil_precharge is input times_variables.t_current_ramp_up = ( physics_variables.plasma_current / 1.0e5 ) @@ -1852,8 +1854,9 @@ def physics(self): else: # times_variables.t_current_ramp_up is set either in INITIAL or INPUT, or by being # iterated using limit equation 41. - times_variables.t_precharge = max( - times_variables.t_precharge, times_variables.t_current_ramp_up + times_variables.t_plant_pulse_coil_precharge = max( + times_variables.t_plant_pulse_coil_precharge, + times_variables.t_current_ramp_up, ) # t_ramp_down = max(t_ramp_down,t_current_ramp_up) times_variables.t_ramp_down = times_variables.t_current_ramp_up @@ -1873,7 +1876,7 @@ def physics(self): + times_variables.t_ramp_down ) times_variables.tdown = ( - times_variables.t_precharge + times_variables.t_plant_pulse_coil_precharge + times_variables.t_current_ramp_up + times_variables.t_ramp_down + times_variables.t_between_pulse @@ -1881,7 +1884,7 @@ def physics(self): # Total cycle time times_variables.t_cycle = ( - times_variables.t_precharge + times_variables.t_plant_pulse_coil_precharge + times_variables.t_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn @@ -3861,8 +3864,8 @@ def outtim(self): po.ovarrf( self.outfile, "Initial charge time for CS from zero current (s)", - "(t_precharge)", - times_variables.t_precharge, + "(t_plant_pulse_coil_precharge)", + times_variables.t_plant_pulse_coil_precharge, ) po.ovarrf( self.outfile, diff --git a/process/power.py b/process/power.py index 914fdc4586..cf033e9427 100644 --- a/process/power.py +++ b/process/power.py @@ -1761,7 +1761,7 @@ def tfpwr(self, output: bool): # Set reactive power to 0, since ramp up can be long # The TF coil can be ramped up as slowly as you like # (although this will affect the time to recover from a magnet quench). - # tfreacmw = 1.0e-6 * 1.0e9 * estotf/(t_current_ramp_up + t_precharge) + # tfreacmw = 1.0e-6 * 1.0e9 * estotf/(t_current_ramp_up + t_plant_pulse_coil_precharge) # estotf(=e_tf_magnetic_stored_total_gj/tfcoil_variables.n_tf_coils) has been removed (#199 #847) tfreacmw = 0.0e0 diff --git a/process/stellarator.py b/process/stellarator.py index 8b6f0cd685..3df4cde502 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5898,7 +5898,7 @@ def stinit(): # Times for different phases - times_variables.t_precharge = 0.0 + times_variables.t_plant_pulse_coil_precharge = 0.0 times_variables.t_current_ramp_up = 0.0 times_variables.t_plant_pulse_burn = 3.15576e7 # one year times_variables.t_ramp_down = 0.0 @@ -5909,13 +5909,13 @@ def stinit(): + times_variables.t_ramp_down ) times_variables.tdown = ( - times_variables.t_precharge + times_variables.t_plant_pulse_coil_precharge + times_variables.t_current_ramp_up + times_variables.t_ramp_down + times_variables.t_between_pulse ) times_variables.t_cycle = ( - times_variables.t_precharge + times_variables.t_plant_pulse_coil_precharge + times_variables.t_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn diff --git a/process/vacuum.py b/process/vacuum.py index 5138418c3a..205b4b8ac9 100644 --- a/process/vacuum.py +++ b/process/vacuum.py @@ -347,9 +347,9 @@ def vacuum( # dwell pumping options if (vacv.i_vac_pump_dwell == 1) or (t_between_pulse == 0): - tpump = tv.t_precharge + tpump = tv.t_plant_pulse_coil_precharge elif vacv.i_vac_pump_dwell == 2: - tpump = t_between_pulse + tv.t_precharge + tpump = t_between_pulse + tv.t_plant_pulse_coil_precharge else: tpump = t_between_pulse @@ -579,8 +579,8 @@ def vacuum( po.ovarre( self.outfile, "CS ramp-up time burns (s)", - "(t_precharge.)", - tv.t_precharge, + "(t_plant_pulse_coil_precharge.)", + tv.t_plant_pulse_coil_precharge, ) po.ovarre( self.outfile, diff --git a/tests/integration/data/large_tokamak_eval.IN.DAT b/tests/integration/data/large_tokamak_eval.IN.DAT index 1195723a66..484504f224 100644 --- a/tests/integration/data/large_tokamak_eval.IN.DAT +++ b/tests/integration/data/large_tokamak_eval.IN.DAT @@ -394,7 +394,7 @@ nflutfmax = 1e22 * max fluence in the TF coil pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up +t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up *--------------------Utilities---------------------* diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 404bb1565f..2d490408c2 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -171,7 +171,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(tfv, "b_crit_upper_nbti", 1.486e1) monkeypatch.setattr(tfv, "t_crit_nbti", 9.04) monkeypatch.setattr(tv, "t_pulse_cumulative", np.full(6, 0.0)) - monkeypatch.setattr(tv, "t_precharge", 5.0e2) + monkeypatch.setattr(tv, "t_plant_pulse_coil_precharge", 5.0e2) monkeypatch.setattr(tv, "t_plant_pulse_burn", 7.1263e-1) monkeypatch.setattr(tv, "t_current_ramp_up", 1.82538e2) monkeypatch.setattr(tv, "t_ramp_down", 1.82538e2) diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 880ae49bd5..c084f00638 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -445,7 +445,7 @@ t_between_pulse = 1800.0 pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/regression/input_files/large_tokamak_eval.IN.DAT b/tests/regression/input_files/large_tokamak_eval.IN.DAT index 6bb0064265..6eb16c0ae0 100644 --- a/tests/regression/input_files/large_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/large_tokamak_eval.IN.DAT @@ -397,7 +397,7 @@ nflutfmax = 1e22 * max fluence in the TF coil pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up +t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up *--------------------Utilities---------------------* diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 963b05f029..ac4a3249a4 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -421,7 +421,7 @@ t_between_pulse = 1800.0 pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 812479d0c2..838b2c2ef9 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3096,8 +3096,8 @@ lsa = 2 *i_vac_pump_dwell = * DESCRIPTION: Switch for dwell pumping options: * =0 pumping only during t_between_pulse -* =1 pumping only during t_precharge -* =2 pumping during t_between_pulse + t_precharge +* =1 pumping only during t_plant_pulse_coil_precharge +* =2 pumping during t_between_pulse + t_plant_pulse_coil_precharge * JUSTIFICATION: Not yet set. *pumpareafraction = @@ -3169,8 +3169,8 @@ t_between_pulse = 100.0 *pulsetimings * DESCRIPTION: Switch for pulse timings (if i_pulsed_plant=1): -* =0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input -* =1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up +* =0, t_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_ramp_down = input +* =1, t_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_ramp_down max of input or t_current_ramp_up * JUSTIFICATION: Assuming default, may change *icc = 41 @@ -3184,8 +3184,8 @@ t_between_pulse = 100.0 *tohsin = * DESCRIPTION: Switch for t_current_ramp_up calculation -* = 0, t_current_ramp_up = t_precharge = t_ramp_down = Ip(MA)/0.5 -* = 1, t_current_ramp_up = tohsin; t_precharge, t_ramp_down are input +* = 0, t_current_ramp_up = t_plant_pulse_coil_precharge = t_ramp_down = Ip(MA)/0.5 +* = 1, t_current_ramp_up = tohsin; t_plant_pulse_coil_precharge, t_ramp_down are input * JUSTIFICATION: Not used, assuming default *t_ramp_down = @@ -3196,7 +3196,7 @@ t_between_pulse = 100.0 * DESCRIPTION: Plasma current ramp-up time for current initiation (s) * JUSTIFICATION: Assuming default of 10 seconds -*t_precharge = +*t_plant_pulse_coil_precharge = * DESCRIPTION: Initial charge time for PF coils (s) * JUSTIFICATION: Assuming default. diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 1f09fb38b0..721fe99172 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -971,7 +971,7 @@ class PfpwrParam(NamedTuple): order="F", ).transpose(), intervallabel=( - "t_precharge ", + "t_plant_pulse_coil_precharge ", "t_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", @@ -1714,7 +1714,7 @@ class PfpwrParam(NamedTuple): order="F", ).transpose(), intervallabel=( - "t_precharge ", + "t_plant_pulse_coil_precharge ", "t_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", diff --git a/tests/unit/test_vacuum.py b/tests/unit/test_vacuum.py index e0ad60734b..9024de204c 100644 --- a/tests/unit/test_vacuum.py +++ b/tests/unit/test_vacuum.py @@ -54,7 +54,7 @@ def test_old_model(self, monkeypatch, vacuum): """ monkeypatch.setattr(pv, "p_fusion_total_mw", 2115.3899563651776) monkeypatch.setattr(pv, "temp_plasma_electron_vol_avg_kev", 15.872999999999999) - monkeypatch.setattr(tv, "t_precharge", 30) + monkeypatch.setattr(tv, "t_plant_pulse_coil_precharge", 30) monkeypatch.setattr(vacv, "i_vac_pump_dwell", 0) monkeypatch.setattr(vacv, "i_vacuum_pump_type", 1) monkeypatch.setattr(vacv, "pres_vv_chamber_base", 0.00050000000000000001) From a2b5d73d1678c87b082560be96acde2121ddcd1f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 15:02:36 +0100 Subject: [PATCH 04/13] =?UTF-8?q?=F0=9F=94=84=20-=20Updated=20all=20instan?= =?UTF-8?q?ces=20of=20`t=5Fcurrent=5Framp=5Fup`=20to=20`t=5Fplant=5Fpulse?= =?UTF-8?q?=5Fplasma=5Fcurrent=5Framp=5Fup`=20across=20documentation,=20in?= =?UTF-8?q?put=20files,=20and=20codebase.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plasma_current/plasma_current.md | 4 +-- documentation/physics-models/pulsed-plant.md | 12 +++---- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/large_tokamak_eval_IN.DAT | 2 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_nof_MFILE.DAT | 2 +- process/constraints.py | 4 +-- process/data_structure/numerics.py | 4 +-- process/data_structure/times_variables.py | 24 ++++++------- process/input.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 6 ++-- process/iteration_variables.py | 5 ++- process/pfcoil.py | 12 ++++--- process/physics.py | 34 +++++++++++-------- process/power.py | 4 +-- process/stellarator.py | 8 ++--- .../data/large_tokamak_eval.IN.DAT | 2 +- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/large_tokamak_eval.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 14 ++++---- tests/unit/test_power.py | 14 ++++---- 26 files changed, 94 insertions(+), 79 deletions(-) diff --git a/documentation/physics-models/plasma_current/plasma_current.md b/documentation/physics-models/plasma_current/plasma_current.md index 17d573163b..ae578188bf 100644 --- a/documentation/physics-models/plasma_current/plasma_current.md +++ b/documentation/physics-models/plasma_current/plasma_current.md @@ -679,9 +679,9 @@ This constraint can be activated by stating `icc = 41` in the input file. The value of `tohsm` can be set to the required minimum plasma current ramp up time at the start of a pulse. The scaling value `ft_current_ramp_up` can be varied also -The calculated plasma current ramp up time `t_current_ramp_up` is dictated by the [pulsed plant operation configuration](../pulsed-plant.md). +The calculated plasma current ramp up time `t_plant_pulse_plasma_current_ramp_up` is dictated by the [pulsed plant operation configuration](../pulsed-plant.md). -This constraint will ensure that the value of `t_current_ramp_up` is always greater than or equal to `tohsm` +This constraint will ensure that the value of `t_plant_pulse_plasma_current_ramp_up` is always greater than or equal to `tohsm` -------------------- diff --git a/documentation/physics-models/pulsed-plant.md b/documentation/physics-models/pulsed-plant.md index 7cf59a7f75..0462a5758e 100644 --- a/documentation/physics-models/pulsed-plant.md +++ b/documentation/physics-models/pulsed-plant.md @@ -29,16 +29,16 @@ change equal to the maximum proposed in [^1], or it can be set by the user. The constraint is likely to depend on whether the ramp-up is purely inductive or includes current drive, but this is not taken ito account. -In the steady-state scenario (`i_pulsed_plant` = 0), the plasma current ramp-up time `t_current_ramp_up` is determined as follows. +In the steady-state scenario (`i_pulsed_plant` = 0), the plasma current ramp-up time `t_plant_pulse_plasma_current_ramp_up` is determined as follows. - If `i_t_current_ramp_up` = 0, the rate of change of plasma current is 0.5 MA/s. The PF coil ramp time `t_plant_pulse_coil_precharge` - and shutdown time `t_ramp_down` are (arbitrarily) set equal to `t_current_ramp_up`. -- If `i_t_current_ramp_up` $\neq$ 0, the plasma current ramp-up time `t_current_ramp_up`, and the PF coil ramp + and shutdown time `t_ramp_down` are (arbitrarily) set equal to `t_plant_pulse_plasma_current_ramp_up`. +- If `i_t_current_ramp_up` $\neq$ 0, the plasma current ramp-up time `t_plant_pulse_plasma_current_ramp_up`, and the PF coil ramp and shutdown times are input parameters. -In the pulsed scenario, (`i_pulsed_plant` = 1), the plasma current ramp-up time `t_current_ramp_up` is an input, and it +In the pulsed scenario, (`i_pulsed_plant` = 1), the plasma current ramp-up time `t_plant_pulse_plasma_current_ramp_up` is an input, and it can be set as an iteration variable (65). The ramp-up and shutdown time in the pulsed case are set -equal to `t_current_ramp_up`. To ensure that the plasma current ramp rate during start-up is prevented from being +equal to `t_plant_pulse_plasma_current_ramp_up`. To ensure that the plasma current ramp rate during start-up is prevented from being too high, as governed by the requirement to maintain plasma stability by ensuring that the induced current has time to diffuse into the body of the plasma, constraint equation no. 41 should be turned on with iteration variable no. 66 `ft_current_ramp_up` and input `t_current_ramp_up_min`, the minimum plasma current @@ -56,7 +56,7 @@ constraint equation no. 13 and iteration variable no 21 (`ft_burn_min`). Over the course of a pulse, the timings are detailed as: - Precharge (`t_plant_pulse_coil_precharge`) - the CS current ramps from zero to maximum value. The other PF coils also ramp from zero to their required values. -- Current ramp-up (`t_current_ramp_up`) - The plasma current ramps up to approx full value. Auxiliary heating is possibly on. +- Current ramp-up (`t_plant_pulse_plasma_current_ramp_up`) - The plasma current ramps up to approx full value. Auxiliary heating is possibly on. - Fusion ramp (`t_plant_pulse_fusion_ramp`) - The plasma temperature and density rise to the full values. The CS and other PF coil currents all change steadily. Auxiliary heating is on. - Burn time (`t_plant_pulse_burn`) - Flat-top duration. The plasma is approximately steady. Fusion power and electricity are produced. The CS and other PF coil currents all change steadily in a pulsed reactor, but are constant for a "steady-state" reactor. Auxiliary heating is on. - Ramp-down (`t_ramp_down`) - The plasma current, density and temperature all ramp down to zero simultaneously. As a starter for ten we could assume that the CS and PF coil currents also ramp to zero at the same time. Auxiliary heating is possibly on. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7382d04e21..d0aa8611f5 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -558,7 +558,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.8571E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6699E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6699E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.1999E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6699E+02 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 833f2cfc01..790dfd065d 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -556,7 +556,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 06b0e64e6e..9f54e0324d 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -556,7 +556,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index e42985d268..68ecb16c42 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -556,7 +556,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 4599d8eb7e..ebbe585c8d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -556,7 +556,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 diff --git a/examples/data/large_tokamak_eval_IN.DAT b/examples/data/large_tokamak_eval_IN.DAT index 87e84a7d03..667eb26a17 100644 --- a/examples/data/large_tokamak_eval_IN.DAT +++ b/examples/data/large_tokamak_eval_IN.DAT @@ -393,7 +393,7 @@ f_a_tf_turn_cable_space_extra_void = 0.3 * coolant fraction of TFC 'cable' ( pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index 94303a2047..bf0426ef22 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -451,7 +451,7 @@ Available_volt-seconds_during_burn_(Wb)__________________________________ (vsmax)________________________ 2.62897202405171981e+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_prechargese_coil_precharge)__________________ 5.00000000000000000e+02 - Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.60910954080422698e+02 + Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.60910954080422698e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.60910954080422698e+02 @@ -1573,7 +1573,7 @@ f_a_tf_turn_cable_space_extra_void = 0.3 * coolant fraction of TFC 'cable' ( pulsetimings = 0 * Switch for pulse timings (if lpulse=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up +t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index 493b81ed6e..3ed4caff8b 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -525,7 +525,7 @@ Available_volt-seconds_during_burn_(Wb)__________________________________ (vsmax)________________________ 2.83743882145049042e+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_prechargese_coil_precharge)__________________ 5.00000000000000000e+02 - Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.75262350092394996e+02 + Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.75262350092394996e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.75262350092394996e+02 diff --git a/process/constraints.py b/process/constraints.py index e42977b5cb..5b696a46a0 100644 --- a/process/constraints.py +++ b/process/constraints.py @@ -1226,13 +1226,13 @@ def constraint_equation_41(): author: P B Lloyd, CCFE, Culham Science Centre ft_current_ramp_up: f-value for plasma current ramp-up time - t_current_ramp_up: plasma current ramp-up time for current initiation (s) + t_plant_pulse_plasma_current_ramp_up: plasma current ramp-up time for current initiation (s) t_current_ramp_up_min: minimum plasma current ramp-up time (s) """ cc = ( 1.0 - data_structure.constraint_variables.ft_current_ramp_up - * data_structure.times_variables.t_current_ramp_up + * data_structure.times_variables.t_plant_pulse_plasma_current_ramp_up / data_structure.constraint_variables.t_current_ramp_up_min ) return ConstraintResult( diff --git a/process/data_structure/numerics.py b/process/data_structure/numerics.py index 6e64e1ecb1..3d477b847a 100644 --- a/process/data_structure/numerics.py +++ b/process/data_structure/numerics.py @@ -160,7 +160,7 @@ * (64) Zeff less than or equal to zeff_max (itv 112) * (65) Dump time set by VV loads (itv 56, 113) * (66) Limit on rate of change of energy in poloidal field -(Use iteration variable 65(t_current_ramp_up), 115) +(Use iteration variable 65(t_plant_pulse_plasma_current_ramp_up), 115) * (67) Simple Radiation Wall load limit (itv 116, 4,6) * (68) Psep * Bt / qAR upper limit (itv 117) * (69) ensure separatrix power = the value from Kallenbach divertor (itv 118) @@ -261,7 +261,7 @@ * (62) fdtmp (f-value for equation 38) * (63) ftemp_fw_max (f-value for equation 39) * (64) fp_hcd_injected_min_mw (f-value for equation 40) -* (65) t_current_ramp_up +* (65) t_plant_pulse_plasma_current_ramp_up * (66) ft_current_ramp_up (f-value for equation 41) * (67) ft_cycle_min (f-value for equation 42) * (68) fptemp (f-value for equation 44) diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index ff3f3b26e0..d6c1c198cf 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -3,8 +3,8 @@ pulsetimings: float = None """Switch for pulse timings (if i_pulsed_plant=1): - - =0, t_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_ramp_down = input - - =1, t_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_ramp_down max of input or t_current_ramp_up""" + - =0, t_plant_pulse_plasma_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_ramp_down = input + - =1, t_plant_pulse_plasma_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_ramp_down max of input or t_plant_pulse_plasma_current_ramp_up""" t_plant_pulse_burn: float = None """flat-top duration (s) (calculated if `i_pulsed_plant=1`)""" @@ -33,24 +33,24 @@ intervallabel: list[str] = None """time intervals - as strings (s)""" -t_current_ramp_up: float = None -"""time for plasma current to ramp up to approx. full value (s) (calculated if `i_pulsed_plant=0`) +t_plant_pulse_plasma_current_ramp_up: float = None +"""Plant pulse time for plasma current to ramp up to approx. full value (s) (calculated if `i_pulsed_plant=0`) (`iteration variable 65`)""" i_t_current_ramp_up: int = None """Switch for plasma current ramp-up time (if i_pulsed_plant=0): - - = 0, t_current_ramp_up = t_plant_pulse_coil_precharge = t_ramp_down = Ip(MA)/0.5 - - = 1, t_current_ramp_up, t_plant_pulse_coil_precharge, t_ramp_down are input""" + - = 0, t_plant_pulse_plasma_current_ramp_up = t_plant_pulse_coil_precharge = t_ramp_down = Ip(MA)/0.5 + - = 1, t_plant_pulse_plasma_current_ramp_up, t_plant_pulse_coil_precharge, t_ramp_down are input""" t_pulse_repetition: float = None -"""pulse length = t_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + t_ramp_down""" +"""pulse length = t_plant_pulse_plasma_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + t_ramp_down""" t_ramp_down: float = None -"""time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_current_ramp_up +"""time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_plant_pulse_plasma_current_ramp_up the CS and PF coil currents also ramp to zero at the same time""" t_plant_pulse_coil_precharge: float = None -"""the time for the central solenoid and PF coils to ramp from zero to max current (s); if pulsed, = t_current_ramp_up""" +"""the time for the central solenoid and PF coils to ramp from zero to max current (s); if pulsed, = t_plant_pulse_plasma_current_ramp_up""" def init_times_variables(): @@ -65,7 +65,7 @@ def init_times_variables(): global t_pulse_cumulative global timelabel global intervallabel - global t_current_ramp_up + global t_plant_pulse_plasma_current_ramp_up global i_t_current_ramp_up global t_pulse_repetition global t_ramp_down @@ -82,12 +82,12 @@ def init_times_variables(): timelabel = ["Start", "BOP ", "EOR ", "BOF ", "EOF ", "EOP "] intervallabel = [ "t_plant_pulse_coil_precharge ", - "t_current_ramp_up ", + "t_plant_pulse_plasma_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", "t_ramp_down ", ] - t_current_ramp_up = 30.0 + t_plant_pulse_plasma_current_ramp_up = 30.0 i_t_current_ramp_up = 0 t_pulse_repetition = 0.0 t_ramp_down = 15.0 diff --git a/process/input.py b/process/input.py index 60a6880d37..cc9692f852 100644 --- a/process/input.py +++ b/process/input.py @@ -1608,7 +1608,7 @@ def __post_init__(self): "t_crit_nbti": InputVariable( data_structure.tfcoil_variables, float, range=(0.0, 15.0) ), - "t_current_ramp_up": InputVariable( + "t_plant_pulse_plasma_current_ramp_up": InputVariable( data_structure.times_variables, float, range=(0.0, 10000.0) ), "t_plant_pulse_fusion_ramp": InputVariable( diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 5afe8866e3..c48ea785ec 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -137,7 +137,7 @@ "ftburn": "ft_burn_min", "ftohs": "ft_current_ramp_up", "tbrnmn": "t_burn_min", - "tohs": "t_current_ramp_up", + "tohs": "t_plant_pulse_plasma_current_ramp_up", "tdwell": "t_between_pulse", "tramp": "t_plant_pulse_coil_precharge", "tqnch": "t_ramp_down", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 82b1d0740f..211a85cbb4 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3151,7 +3151,9 @@ def plot_current_profiles_over_time( t_plant_pulse_coil_precharge = mfile_data.data[ "t_plant_pulse_coil_precharge" ].get_scan(scan) - t_current_ramp_up = mfile_data.data["t_current_ramp_up"].get_scan(scan) + t_plant_pulse_plasma_current_ramp_up = mfile_data.data[ + "t_plant_pulse_plasma_current_ramp_up" + ].get_scan(scan) t_plant_pulse_fusion_ramp = mfile_data.data["t_plant_pulse_fusion_ramp"].get_scan( scan ) @@ -3162,7 +3164,7 @@ def plot_current_profiles_over_time( t_steps = np.cumsum([ 0, t_plant_pulse_coil_precharge, - t_current_ramp_up, + t_plant_pulse_plasma_current_ramp_up, t_plant_pulse_fusion_ramp, t_plant_pulse_burn, t_ramp_down, diff --git a/process/iteration_variables.py b/process/iteration_variables.py index 5778199737..c3b5da26e8 100644 --- a/process/iteration_variables.py +++ b/process/iteration_variables.py @@ -159,7 +159,10 @@ class IterationVariable: "fp_hcd_injected_min_mw", data_structure.constraint_variables, 0.001, 1.0 ), 65: IterationVariable( - "t_current_ramp_up", data_structure.times_variables, 0.1, 1.0e3 + "t_plant_pulse_plasma_current_ramp_up", + data_structure.times_variables, + 0.1, + 1.0e3, ), 66: IterationVariable( "ft_current_ramp_up", data_structure.constraint_variables, 0.001, 1.0 diff --git a/process/pfcoil.py b/process/pfcoil.py index 692adb8bdf..75c804b9f4 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -137,7 +137,9 @@ def pfcoil(self): # Set up array of times tv.t_pulse_cumulative[0] = 0.0e0 tv.t_pulse_cumulative[1] = tv.t_plant_pulse_coil_precharge - tv.t_pulse_cumulative[2] = tv.t_pulse_cumulative[1] + tv.t_current_ramp_up + tv.t_pulse_cumulative[2] = ( + tv.t_pulse_cumulative[1] + tv.t_plant_pulse_plasma_current_ramp_up + ) tv.t_pulse_cumulative[3] = ( tv.t_pulse_cumulative[2] + tv.t_plant_pulse_fusion_ramp ) @@ -654,7 +656,7 @@ def pfcoil(self): 1.0e-6 * pfcoil_variables.ccl0[nng] ) - # Beginning of flat-top: t = tv.t_plant_pulse_coil_precharge+tv.t_current_ramp_up + # Beginning of flat-top: t = tv.t_plant_pulse_coil_precharge+tv.t_plant_pulse_plasma_current_ramp_up pfcoil_variables.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ( pfcoil_variables.ccls[nng] - ( @@ -664,7 +666,7 @@ def pfcoil(self): ) ) - # End of flat-top: t = tv.t_plant_pulse_coil_precharge+tv.t_current_ramp_up+tv.t_plant_pulse_fusion_ramp+tv.t_plant_pulse_burn + # End of flat-top: t = tv.t_plant_pulse_coil_precharge+tv.t_plant_pulse_plasma_current_ramp_up+tv.t_plant_pulse_fusion_ramp+tv.t_plant_pulse_burn pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ( pfcoil_variables.ccls[nng] - ( @@ -2913,7 +2915,7 @@ def waveform(self): pfcoil_variables.c_pf_cs_coil_pulse_start_ma[ic] ) - # Beginning of flat-top, t = t_plant_pulse_coil_precharge + t_current_ramp_up + # Beginning of flat-top, t = t_plant_pulse_coil_precharge + t_plant_pulse_plasma_current_ramp_up if ( abs(pfcoil_variables.c_pf_cs_coil_flat_top_ma[ic]) >= abs(pfcoil_variables.c_pf_cs_coil_pulse_start_ma[ic]) @@ -2925,7 +2927,7 @@ def waveform(self): pfcoil_variables.c_pf_cs_coil_flat_top_ma[ic] ) - # End of flat-top, t = t_plant_pulse_coil_precharge + t_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + # End of flat-top, t = t_plant_pulse_coil_precharge + t_plant_pulse_plasma_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn if ( abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) >= abs(pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic]) diff --git a/process/physics.py b/process/physics.py index d546bd9bc6..1a114ad261 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1835,31 +1835,37 @@ def physics(self): # Set PF coil ramp times if pulse_variables.i_pulsed_plant != 1: if times_variables.i_t_current_ramp_up == 0: - times_variables.t_current_ramp_up = ( + times_variables.t_plant_pulse_plasma_current_ramp_up = ( physics_variables.plasma_current / 5.0e5 ) times_variables.t_plant_pulse_coil_precharge = ( - times_variables.t_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_up + ) + times_variables.t_ramp_down = ( + times_variables.t_plant_pulse_plasma_current_ramp_up ) - times_variables.t_ramp_down = times_variables.t_current_ramp_up else: if times_variables.pulsetimings == 0.0e0: # times_variables.t_plant_pulse_coil_precharge is input - times_variables.t_current_ramp_up = ( + times_variables.t_plant_pulse_plasma_current_ramp_up = ( physics_variables.plasma_current / 1.0e5 ) - times_variables.t_ramp_down = times_variables.t_current_ramp_up + times_variables.t_ramp_down = ( + times_variables.t_plant_pulse_plasma_current_ramp_up + ) else: - # times_variables.t_current_ramp_up is set either in INITIAL or INPUT, or by being + # times_variables.t_plant_pulse_plasma_current_ramp_up is set either in INITIAL or INPUT, or by being # iterated using limit equation 41. times_variables.t_plant_pulse_coil_precharge = max( times_variables.t_plant_pulse_coil_precharge, - times_variables.t_current_ramp_up, + times_variables.t_plant_pulse_plasma_current_ramp_up, + ) + # t_ramp_down = max(t_ramp_down,t_plant_pulse_plasma_current_ramp_up) + times_variables.t_ramp_down = ( + times_variables.t_plant_pulse_plasma_current_ramp_up ) - # t_ramp_down = max(t_ramp_down,t_current_ramp_up) - times_variables.t_ramp_down = times_variables.t_current_ramp_up # Reset second times_variables.t_plant_pulse_burn value (times_variables.t_burn_0). # This is used to ensure that the burn time is used consistently; @@ -1870,14 +1876,14 @@ def physics(self): # at all times outside of the plasma current flat-top period. # The pulse length is the duration of non-zero plasma current times_variables.t_pulse_repetition = ( - times_variables.t_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down ) times_variables.tdown = ( times_variables.t_plant_pulse_coil_precharge - + times_variables.t_current_ramp_up + + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_ramp_down + times_variables.t_between_pulse ) @@ -1885,7 +1891,7 @@ def physics(self): # Total cycle time times_variables.t_cycle = ( times_variables.t_plant_pulse_coil_precharge - + times_variables.t_current_ramp_up + + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down @@ -3870,8 +3876,8 @@ def outtim(self): po.ovarrf( self.outfile, "Plasma current ramp-up time (s)", - "(t_current_ramp_up)", - times_variables.t_current_ramp_up, + "(t_plant_pulse_plasma_current_ramp_up)", + times_variables.t_plant_pulse_plasma_current_ramp_up, ) po.ovarrf( self.outfile, diff --git a/process/power.py b/process/power.py index cf033e9427..f7bf6ed0c0 100644 --- a/process/power.py +++ b/process/power.py @@ -121,7 +121,7 @@ def pfpwr(self, output: bool): pf_power_variables.srcktpm = pf_power_variables.srcktpm + 1.0e3 * rcktpm[ig] # Inductive MVA requirements, and stored energy - delktim = times_variables.t_current_ramp_up + delktim = times_variables.t_plant_pulse_plasma_current_ramp_up # PF system (including Central Solenoid solenoid) inductive MVA requirements # pfcoil_variables.c_pf_coil_turn(i,j) : current per turn of coil i at (end) time period j (A) @@ -1761,7 +1761,7 @@ def tfpwr(self, output: bool): # Set reactive power to 0, since ramp up can be long # The TF coil can be ramped up as slowly as you like # (although this will affect the time to recover from a magnet quench). - # tfreacmw = 1.0e-6 * 1.0e9 * estotf/(t_current_ramp_up + t_plant_pulse_coil_precharge) + # tfreacmw = 1.0e-6 * 1.0e9 * estotf/(t_plant_pulse_plasma_current_ramp_up + t_plant_pulse_coil_precharge) # estotf(=e_tf_magnetic_stored_total_gj/tfcoil_variables.n_tf_coils) has been removed (#199 #847) tfreacmw = 0.0e0 diff --git a/process/stellarator.py b/process/stellarator.py index 3df4cde502..7a55ad450f 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5899,24 +5899,24 @@ def stinit(): # Times for different phases times_variables.t_plant_pulse_coil_precharge = 0.0 - times_variables.t_current_ramp_up = 0.0 + times_variables.t_plant_pulse_plasma_current_ramp_up = 0.0 times_variables.t_plant_pulse_burn = 3.15576e7 # one year times_variables.t_ramp_down = 0.0 times_variables.t_pulse_repetition = ( - times_variables.t_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down ) times_variables.tdown = ( times_variables.t_plant_pulse_coil_precharge - + times_variables.t_current_ramp_up + + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_ramp_down + times_variables.t_between_pulse ) times_variables.t_cycle = ( times_variables.t_plant_pulse_coil_precharge - + times_variables.t_current_ramp_up + + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_ramp_down diff --git a/tests/integration/data/large_tokamak_eval.IN.DAT b/tests/integration/data/large_tokamak_eval.IN.DAT index 484504f224..73cab3979b 100644 --- a/tests/integration/data/large_tokamak_eval.IN.DAT +++ b/tests/integration/data/large_tokamak_eval.IN.DAT @@ -394,7 +394,7 @@ nflutfmax = 1e22 * max fluence in the TF coil pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up +t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 2d490408c2..bf6354ae78 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -173,7 +173,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(tv, "t_pulse_cumulative", np.full(6, 0.0)) monkeypatch.setattr(tv, "t_plant_pulse_coil_precharge", 5.0e2) monkeypatch.setattr(tv, "t_plant_pulse_burn", 7.1263e-1) - monkeypatch.setattr(tv, "t_current_ramp_up", 1.82538e2) + monkeypatch.setattr(tv, "t_plant_pulse_plasma_current_ramp_up", 1.82538e2) monkeypatch.setattr(tv, "t_ramp_down", 1.82538e2) monkeypatch.setattr(tv, "t_plant_pulse_fusion_ramp", 1.0e1) monkeypatch.setattr(constants, "den_copper", 8.9e3) diff --git a/tests/regression/input_files/large_tokamak_eval.IN.DAT b/tests/regression/input_files/large_tokamak_eval.IN.DAT index 6eb16c0ae0..2aec434934 100644 --- a/tests/regression/input_files/large_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/large_tokamak_eval.IN.DAT @@ -397,7 +397,7 @@ nflutfmax = 1e22 * max fluence in the TF coil pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up +t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 838b2c2ef9..1e8c6f6a36 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3169,30 +3169,30 @@ t_between_pulse = 100.0 *pulsetimings * DESCRIPTION: Switch for pulse timings (if i_pulsed_plant=1): -* =0, t_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_ramp_down = input -* =1, t_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_ramp_down max of input or t_current_ramp_up +* =0, t_plant_pulse_plasma_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_ramp_down = input +* =1, t_plant_pulse_plasma_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_ramp_down max of input or t_plant_pulse_plasma_current_ramp_up * JUSTIFICATION: Assuming default, may change *icc = 41 * DESCRIPTION: Constraint equation for plasma current ramp-up time lower limit * JUSTIFICATION: Turned off, do not care about plasma current ramp up time -* VARIABLES: t_current_ramp_up (s) calculated in-situ +* VARIABLES: t_plant_pulse_plasma_current_ramp_up (s) calculated in-situ *t_current_ramp_up_min = * DESCRIPTION: Minimum plasma current ramp-up time (s) * JUSTIFICATION: Turned off, not using icc = 41 *tohsin = -* DESCRIPTION: Switch for t_current_ramp_up calculation -* = 0, t_current_ramp_up = t_plant_pulse_coil_precharge = t_ramp_down = Ip(MA)/0.5 -* = 1, t_current_ramp_up = tohsin; t_plant_pulse_coil_precharge, t_ramp_down are input +* DESCRIPTION: Switch for t_plant_pulse_plasma_current_ramp_up calculation +* = 0, t_plant_pulse_plasma_current_ramp_up = t_plant_pulse_coil_precharge = t_ramp_down = Ip(MA)/0.5 +* = 1, t_plant_pulse_plasma_current_ramp_up = tohsin; t_plant_pulse_coil_precharge, t_ramp_down are input * JUSTIFICATION: Not used, assuming default *t_ramp_down = * DESCRIPTION: PF coil shutdown time (s) * JUSTIFICATION: Assuming default. -*t_current_ramp_up = +*t_plant_pulse_plasma_current_ramp_up = * DESCRIPTION: Plasma current ramp-up time for current initiation (s) * JUSTIFICATION: Assuming default of 10 seconds diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 721fe99172..5eab487e2e 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -236,7 +236,7 @@ class PfpwrParam(NamedTuple): timelabel: Any = None - t_current_ramp_up: Any = None + t_plant_pulse_plasma_current_ramp_up: Any = None outfile: Any = None @@ -972,7 +972,7 @@ class PfpwrParam(NamedTuple): ).transpose(), intervallabel=( "t_plant_pulse_coil_precharge ", - "t_current_ramp_up ", + "t_plant_pulse_plasma_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", "t_ramp_down ", @@ -985,7 +985,7 @@ class PfpwrParam(NamedTuple): "EOF ", "EOP ", ), - t_current_ramp_up=177.21306969367816, + t_plant_pulse_plasma_current_ramp_up=177.21306969367816, outfile=11, iprint=0, expected_peakmva=736.39062584245937, @@ -1715,7 +1715,7 @@ class PfpwrParam(NamedTuple): ).transpose(), intervallabel=( "t_plant_pulse_coil_precharge ", - "t_current_ramp_up ", + "t_plant_pulse_plasma_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", "t_ramp_down ", @@ -1728,7 +1728,7 @@ class PfpwrParam(NamedTuple): "EOF ", "EOP ", ), - t_current_ramp_up=177.21306969367816, + t_plant_pulse_plasma_current_ramp_up=177.21306969367816, outfile=11, iprint=0, expected_peakmva=90.673341440806112, @@ -1870,7 +1870,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): ) monkeypatch.setattr( - times_variables, "t_current_ramp_up", pfpwrparam.t_current_ramp_up + times_variables, + "t_plant_pulse_plasma_current_ramp_up", + pfpwrparam.t_plant_pulse_plasma_current_ramp_up, ) power.pfpwr(output=False) From 9f30f022e885de4178062a621b88cc0f7b87bc73 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 15:04:08 +0100 Subject: [PATCH 05/13] =?UTF-8?q?=F0=9F=94=84=20-=20Rename=20`t=5Framp=5Fd?= =?UTF-8?q?own`=20to=20`t=5Fplant=5Fpulse=5Fplasma=5Fcurrent=5Framp=5Fdown?= =?UTF-8?q?`=20across=20codebase=20and=20documentation=20for=20consistency?= =?UTF-8?q?=20with=20updated=20terminology.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/physics-models/pulsed-plant.md | 4 ++-- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 2 +- examples/data/large_tokamak_nof_MFILE.DAT | 2 +- process/data_structure/times_variables.py | 20 +++++++++---------- process/input.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 6 ++++-- process/pfcoil.py | 4 +++- process/physics.py | 18 ++++++++--------- process/stellarator.py | 8 ++++---- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/st_regression.IN.DAT | 10 +++++----- tests/unit/test_power.py | 4 ++-- 18 files changed, 49 insertions(+), 45 deletions(-) diff --git a/documentation/physics-models/pulsed-plant.md b/documentation/physics-models/pulsed-plant.md index 0462a5758e..2bd5a84b20 100644 --- a/documentation/physics-models/pulsed-plant.md +++ b/documentation/physics-models/pulsed-plant.md @@ -32,7 +32,7 @@ but this is not taken ito account. In the steady-state scenario (`i_pulsed_plant` = 0), the plasma current ramp-up time `t_plant_pulse_plasma_current_ramp_up` is determined as follows. - If `i_t_current_ramp_up` = 0, the rate of change of plasma current is 0.5 MA/s. The PF coil ramp time `t_plant_pulse_coil_precharge` - and shutdown time `t_ramp_down` are (arbitrarily) set equal to `t_plant_pulse_plasma_current_ramp_up`. + and shutdown time `t_plant_pulse_plasma_current_ramp_down` are (arbitrarily) set equal to `t_plant_pulse_plasma_current_ramp_up`. - If `i_t_current_ramp_up` $\neq$ 0, the plasma current ramp-up time `t_plant_pulse_plasma_current_ramp_up`, and the PF coil ramp and shutdown times are input parameters. @@ -59,7 +59,7 @@ Over the course of a pulse, the timings are detailed as: - Current ramp-up (`t_plant_pulse_plasma_current_ramp_up`) - The plasma current ramps up to approx full value. Auxiliary heating is possibly on. - Fusion ramp (`t_plant_pulse_fusion_ramp`) - The plasma temperature and density rise to the full values. The CS and other PF coil currents all change steadily. Auxiliary heating is on. - Burn time (`t_plant_pulse_burn`) - Flat-top duration. The plasma is approximately steady. Fusion power and electricity are produced. The CS and other PF coil currents all change steadily in a pulsed reactor, but are constant for a "steady-state" reactor. Auxiliary heating is on. -- Ramp-down (`t_ramp_down`) - The plasma current, density and temperature all ramp down to zero simultaneously. As a starter for ten we could assume that the CS and PF coil currents also ramp to zero at the same time. Auxiliary heating is possibly on. +- Ramp-down (`t_plant_pulse_plasma_current_ramp_down`) - The plasma current, density and temperature all ramp down to zero simultaneously. As a starter for ten we could assume that the CS and PF coil currents also ramp to zero at the same time. Auxiliary heating is possibly on. - Between pulse (`t_between_pulse`) - CS and PF coil currents are zero - a few minutes may be required to permit vacuum pumping. May be much longer for an experimental device such as DEMO. - Pulse repitition (`t_pulse_repitition`) - Sum of all the above times. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index d0aa8611f5..5220a12be5 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -561,7 +561,7 @@ Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6699E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.1999E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6699E+02 + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6699E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8441E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 790dfd065d..c3382343eb 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -559,7 +559,7 @@ Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 9f54e0324d..569f9790d5 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -559,7 +559,7 @@ Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 68ecb16c42..4bf66c8502 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -559,7 +559,7 @@ Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index ebbe585c8d..a082f3ec38 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -559,7 +559,7 @@ Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index bf0426ef22..1666bbc48f 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -454,7 +454,7 @@ Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.60910954080422698e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP - Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.60910954080422698e+02 + Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.60910954080422698e+02 Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_cycle)______________________ 8.76211449542915943e+03 OP # Radial Build # diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index 3ed4caff8b..c62c6cc98e 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -528,7 +528,7 @@ Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.75262350092394996e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP - Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.75262350092394996e+02 + Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.75262350092394996e+02 Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_cycle)______________________ 1.00054568371814421e+04 OP # Radial Build # diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index d6c1c198cf..686704a7e8 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -3,8 +3,8 @@ pulsetimings: float = None """Switch for pulse timings (if i_pulsed_plant=1): - - =0, t_plant_pulse_plasma_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_ramp_down = input - - =1, t_plant_pulse_plasma_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_ramp_down max of input or t_plant_pulse_plasma_current_ramp_up""" + - =0, t_plant_pulse_plasma_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_plant_pulse_plasma_current_ramp_down = input + - =1, t_plant_pulse_plasma_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_plant_pulse_plasma_current_ramp_down max of input or t_plant_pulse_plasma_current_ramp_up""" t_plant_pulse_burn: float = None """flat-top duration (s) (calculated if `i_pulsed_plant=1`)""" @@ -39,14 +39,14 @@ i_t_current_ramp_up: int = None """Switch for plasma current ramp-up time (if i_pulsed_plant=0): - - = 0, t_plant_pulse_plasma_current_ramp_up = t_plant_pulse_coil_precharge = t_ramp_down = Ip(MA)/0.5 - - = 1, t_plant_pulse_plasma_current_ramp_up, t_plant_pulse_coil_precharge, t_ramp_down are input""" + - = 0, t_plant_pulse_plasma_current_ramp_up = t_plant_pulse_coil_precharge = t_plant_pulse_plasma_current_ramp_down = Ip(MA)/0.5 + - = 1, t_plant_pulse_plasma_current_ramp_up, t_plant_pulse_coil_precharge, t_plant_pulse_plasma_current_ramp_down are input""" t_pulse_repetition: float = None -"""pulse length = t_plant_pulse_plasma_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + t_ramp_down""" +"""pulse length = t_plant_pulse_plasma_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + t_plant_pulse_plasma_current_ramp_down""" -t_ramp_down: float = None -"""time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_plant_pulse_plasma_current_ramp_up +t_plant_pulse_plasma_current_ramp_down: float = None +"""Plant pulse time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_plant_pulse_plasma_current_ramp_up the CS and PF coil currents also ramp to zero at the same time""" t_plant_pulse_coil_precharge: float = None @@ -68,7 +68,7 @@ def init_times_variables(): global t_plant_pulse_plasma_current_ramp_up global i_t_current_ramp_up global t_pulse_repetition - global t_ramp_down + global t_plant_pulse_plasma_current_ramp_down global t_plant_pulse_coil_precharge pulsetimings = 1.0 @@ -85,10 +85,10 @@ def init_times_variables(): "t_plant_pulse_plasma_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", - "t_ramp_down ", + "t_plant_pulse_plasma_current_ramp_down ", ] t_plant_pulse_plasma_current_ramp_up = 30.0 i_t_current_ramp_up = 0 t_pulse_repetition = 0.0 - t_ramp_down = 15.0 + t_plant_pulse_plasma_current_ramp_down = 15.0 t_plant_pulse_coil_precharge = 15.0 diff --git a/process/input.py b/process/input.py index cc9692f852..bea26e0d52 100644 --- a/process/input.py +++ b/process/input.py @@ -1626,7 +1626,7 @@ def __post_init__(self): "t_plant_pulse_coil_precharge": InputVariable( data_structure.times_variables, float, range=(0.0, 10000.0) ), - "t_ramp_down": InputVariable( + "t_plant_pulse_plasma_current_ramp_down": InputVariable( data_structure.times_variables, float, range=(0.0, 10000.0) ), "dr_cs_turn_conduit": InputVariable( diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index c48ea785ec..ec833cab4f 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -140,7 +140,7 @@ "tohs": "t_plant_pulse_plasma_current_ramp_up", "tdwell": "t_between_pulse", "tramp": "t_plant_pulse_coil_precharge", - "tqnch": "t_ramp_down", + "tqnch": "t_plant_pulse_plasma_current_ramp_down", "tburn": "t_plant_pulse_burn", "pdivmax/rmajor": "pdivmax_over_rmajor", "pdivtbt/qar": "pdivtbt_over_qar", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 211a85cbb4..fe3a92963b 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -3158,7 +3158,9 @@ def plot_current_profiles_over_time( scan ) t_plant_pulse_burn = mfile_data.data["t_plant_pulse_burn"].get_scan(scan) - t_ramp_down = mfile_data.data["t_ramp_down"].get_scan(scan) + t_plant_pulse_plasma_current_ramp_down = mfile_data.data[ + "t_plant_pulse_plasma_current_ramp_down" + ].get_scan(scan) # Define a cumulative sum list for each point in the pulse t_steps = np.cumsum([ @@ -3167,7 +3169,7 @@ def plot_current_profiles_over_time( t_plant_pulse_plasma_current_ramp_up, t_plant_pulse_fusion_ramp, t_plant_pulse_burn, - t_ramp_down, + t_plant_pulse_plasma_current_ramp_down, ]) # Find the number of PF circuits, n_pf_cs_plasma_circuits includes the CS and plasma circuits diff --git a/process/pfcoil.py b/process/pfcoil.py index 75c804b9f4..65dc4310bf 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -144,7 +144,9 @@ def pfcoil(self): tv.t_pulse_cumulative[2] + tv.t_plant_pulse_fusion_ramp ) tv.t_pulse_cumulative[4] = tv.t_pulse_cumulative[3] + tv.t_plant_pulse_burn - tv.t_pulse_cumulative[5] = tv.t_pulse_cumulative[4] + tv.t_ramp_down + tv.t_pulse_cumulative[5] = ( + tv.t_pulse_cumulative[4] + tv.t_plant_pulse_plasma_current_ramp_down + ) # Set up call to MHD scaling routine for coil currents. # First break up Central Solenoid solenoid into 'filaments' diff --git a/process/physics.py b/process/physics.py index 1a114ad261..f9a9ba75a8 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1841,7 +1841,7 @@ def physics(self): times_variables.t_plant_pulse_coil_precharge = ( times_variables.t_plant_pulse_plasma_current_ramp_up ) - times_variables.t_ramp_down = ( + times_variables.t_plant_pulse_plasma_current_ramp_down = ( times_variables.t_plant_pulse_plasma_current_ramp_up ) @@ -1851,7 +1851,7 @@ def physics(self): times_variables.t_plant_pulse_plasma_current_ramp_up = ( physics_variables.plasma_current / 1.0e5 ) - times_variables.t_ramp_down = ( + times_variables.t_plant_pulse_plasma_current_ramp_down = ( times_variables.t_plant_pulse_plasma_current_ramp_up ) @@ -1862,8 +1862,8 @@ def physics(self): times_variables.t_plant_pulse_coil_precharge, times_variables.t_plant_pulse_plasma_current_ramp_up, ) - # t_ramp_down = max(t_ramp_down,t_plant_pulse_plasma_current_ramp_up) - times_variables.t_ramp_down = ( + # t_plant_pulse_plasma_current_ramp_down = max(t_plant_pulse_plasma_current_ramp_down,t_plant_pulse_plasma_current_ramp_up) + times_variables.t_plant_pulse_plasma_current_ramp_down = ( times_variables.t_plant_pulse_plasma_current_ramp_up ) @@ -1879,12 +1879,12 @@ def physics(self): times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn - + times_variables.t_ramp_down + + times_variables.t_plant_pulse_plasma_current_ramp_down ) times_variables.tdown = ( times_variables.t_plant_pulse_coil_precharge + times_variables.t_plant_pulse_plasma_current_ramp_up - + times_variables.t_ramp_down + + times_variables.t_plant_pulse_plasma_current_ramp_down + times_variables.t_between_pulse ) @@ -1894,7 +1894,7 @@ def physics(self): + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn - + times_variables.t_ramp_down + + times_variables.t_plant_pulse_plasma_current_ramp_down + times_variables.t_between_pulse ) @@ -3895,8 +3895,8 @@ def outtim(self): po.ovarrf( self.outfile, "Reset time to zero current for CS (s)", - "(t_ramp_down)", - times_variables.t_ramp_down, + "(t_plant_pulse_plasma_current_ramp_down)", + times_variables.t_plant_pulse_plasma_current_ramp_down, ) po.ovarrf( self.outfile, diff --git a/process/stellarator.py b/process/stellarator.py index 7a55ad450f..9151a5fcde 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5901,17 +5901,17 @@ def stinit(): times_variables.t_plant_pulse_coil_precharge = 0.0 times_variables.t_plant_pulse_plasma_current_ramp_up = 0.0 times_variables.t_plant_pulse_burn = 3.15576e7 # one year - times_variables.t_ramp_down = 0.0 + times_variables.t_plant_pulse_plasma_current_ramp_down = 0.0 times_variables.t_pulse_repetition = ( times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn - + times_variables.t_ramp_down + + times_variables.t_plant_pulse_plasma_current_ramp_down ) times_variables.tdown = ( times_variables.t_plant_pulse_coil_precharge + times_variables.t_plant_pulse_plasma_current_ramp_up - + times_variables.t_ramp_down + + times_variables.t_plant_pulse_plasma_current_ramp_down + times_variables.t_between_pulse ) times_variables.t_cycle = ( @@ -5919,6 +5919,6 @@ def stinit(): + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn - + times_variables.t_ramp_down + + times_variables.t_plant_pulse_plasma_current_ramp_down + times_variables.t_between_pulse ) diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index bf6354ae78..c2bfc829c2 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -174,7 +174,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(tv, "t_plant_pulse_coil_precharge", 5.0e2) monkeypatch.setattr(tv, "t_plant_pulse_burn", 7.1263e-1) monkeypatch.setattr(tv, "t_plant_pulse_plasma_current_ramp_up", 1.82538e2) - monkeypatch.setattr(tv, "t_ramp_down", 1.82538e2) + monkeypatch.setattr(tv, "t_plant_pulse_plasma_current_ramp_down", 1.82538e2) monkeypatch.setattr(tv, "t_plant_pulse_fusion_ramp", 1.0e1) monkeypatch.setattr(constants, "den_copper", 8.9e3) monkeypatch.setattr(pfcoil_variables, "first_call", True) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 1e8c6f6a36..39b3bae9dd 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3169,8 +3169,8 @@ t_between_pulse = 100.0 *pulsetimings * DESCRIPTION: Switch for pulse timings (if i_pulsed_plant=1): -* =0, t_plant_pulse_plasma_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_ramp_down = input -* =1, t_plant_pulse_plasma_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_ramp_down max of input or t_plant_pulse_plasma_current_ramp_up +* =0, t_plant_pulse_plasma_current_ramp_up = Ip(MA)/0.1 t_plant_pulse_coil_precharge, t_plant_pulse_plasma_current_ramp_down = input +* =1, t_plant_pulse_plasma_current_ramp_up = iteration var or input. t_plant_pulse_coil_precharge/t_plant_pulse_plasma_current_ramp_down max of input or t_plant_pulse_plasma_current_ramp_up * JUSTIFICATION: Assuming default, may change *icc = 41 @@ -3184,11 +3184,11 @@ t_between_pulse = 100.0 *tohsin = * DESCRIPTION: Switch for t_plant_pulse_plasma_current_ramp_up calculation -* = 0, t_plant_pulse_plasma_current_ramp_up = t_plant_pulse_coil_precharge = t_ramp_down = Ip(MA)/0.5 -* = 1, t_plant_pulse_plasma_current_ramp_up = tohsin; t_plant_pulse_coil_precharge, t_ramp_down are input +* = 0, t_plant_pulse_plasma_current_ramp_up = t_plant_pulse_coil_precharge = t_plant_pulse_plasma_current_ramp_down = Ip(MA)/0.5 +* = 1, t_plant_pulse_plasma_current_ramp_up = tohsin; t_plant_pulse_coil_precharge, t_plant_pulse_plasma_current_ramp_down are input * JUSTIFICATION: Not used, assuming default -*t_ramp_down = +*t_plant_pulse_plasma_current_ramp_down = * DESCRIPTION: PF coil shutdown time (s) * JUSTIFICATION: Assuming default. diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 5eab487e2e..b890e525df 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -975,7 +975,7 @@ class PfpwrParam(NamedTuple): "t_plant_pulse_plasma_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", - "t_ramp_down ", + "t_plant_pulse_plasma_current_ramp_down ", ), timelabel=( "Start ", @@ -1718,7 +1718,7 @@ class PfpwrParam(NamedTuple): "t_plant_pulse_plasma_current_ramp_up ", "t_plant_pulse_fusion_ramp ", "t_plant_pulse_burn ", - "t_ramp_down ", + "t_plant_pulse_plasma_current_ramp_down ", ), timelabel=( "Start ", From 7371b5feeed74721305abe858be6a92a0a16514a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 15:11:12 +0100 Subject: [PATCH 06/13] =?UTF-8?q?=F0=9F=94=84=20-=20Refactor=20variable=20?= =?UTF-8?q?names=20from=20`t=5Fcycle`=20to=20`t=5Fplant=5Fpulse=5Ftotal`?= =?UTF-8?q?=20across=20multiple=20files=20for=20consistency=20with=20updat?= =?UTF-8?q?ed=20terminology.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 2 +- examples/data/large_tokamak_nof_MFILE.DAT | 2 +- process/availability.py | 20 +++++++++---------- process/constraints.py | 4 ++-- process/costs.py | 2 +- process/data_structure/times_variables.py | 8 ++++---- process/physics.py | 6 +++--- process/stellarator.py | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_availability.py | 18 ++++++++++------- tests/unit/test_costs_1990.py | 10 ++++++---- 16 files changed, 46 insertions(+), 40 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 5220a12be5..7357511663 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -563,7 +563,7 @@ Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.1999E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6699E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8441E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8441E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index c3382343eb..c139251d40 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -561,7 +561,7 @@ Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 569f9790d5..8db3ee0b2a 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -561,7 +561,7 @@ Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 4bf66c8502..cc11e03efe 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -561,7 +561,7 @@ Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a082f3ec38..b54f1937a2 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -561,7 +561,7 @@ Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index 1666bbc48f..6811e36989 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -456,7 +456,7 @@ Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.60910954080422698e+02 Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 - Total_plant_cycle_time_(s)_______________________________________________ (t_cycle)______________________ 8.76211449542915943e+03 OP + Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 8.76211449542915943e+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 Inboard_build_thickness_(m)______________________________________________ (dr_inboard_build)_____________ 5.33333333333333393e+00 OP diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index c62c6cc98e..3fca7c5aaa 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -530,7 +530,7 @@ Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.75262350092394996e+02 Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 - Total_plant_cycle_time_(s)_______________________________________________ (t_cycle)______________________ 1.00054568371814421e+04 OP + Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 1.00054568371814421e+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 Inboard_build_thickness_(m)______________________________________________ (dr_inboard_build)_____________ 5.33333333333333393e+00 OP diff --git a/process/availability.py b/process/availability.py index 3968f3fc00..1306ac7157 100644 --- a/process/availability.py +++ b/process/availability.py @@ -136,7 +136,7 @@ def avail(self, output: bool): # Plant Availability (iavail=0,1) # Calculate the number of fusion cycles for a given blanket lifetime - pulse_fpy = tv.t_cycle / YEAR_SECONDS + pulse_fpy = tv.t_plant_pulse_total / YEAR_SECONDS cv.bktcycles = (fwbsv.life_blkt_fpy / pulse_fpy) + 1 # if iavail = 0 use input value for cfactr @@ -176,7 +176,7 @@ def avail(self, output: bool): # Capacity factor # Using the amount of time burning for a given pulse cycle - cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_cycle) + cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_plant_pulse_total) # Modify lifetimes to take account of the availability if ifev.ife != 1: @@ -383,7 +383,7 @@ def avail_2(self, output: bool): cv.cplife = min(cv.cplife / cv.cfactr, cv.tlife) # Capacity factor - cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_cycle) + cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_plant_pulse_total) # Output if output: @@ -673,11 +673,11 @@ def calc_u_unplanned_divertor(self, output: bool) -> float: # Calculate cycle limit in terms of days # Number of cycles between planned blanket replacements, N - n = cv.divlife * YEAR_SECONDS / tv.t_cycle + n = cv.divlife * YEAR_SECONDS / tv.t_plant_pulse_total # The probability of failure in one pulse cycle (before the reference cycle life) - pf = (cv.div_prob_fail / DAY_SECONDS) * tv.t_cycle - a0 = 1.0e0 - pf * cv.div_umain_time * YEAR_SECONDS / tv.t_cycle + pf = (cv.div_prob_fail / DAY_SECONDS) * tv.t_plant_pulse_total + a0 = 1.0e0 - pf * cv.div_umain_time * YEAR_SECONDS / tv.t_plant_pulse_total # Integrating the instantaneous availability gives the mean # availability over the planned cycle life N @@ -769,12 +769,12 @@ def calc_u_unplanned_fwbs(self, output: bool) -> float: # Calculate cycle limit in terms of days # Number of cycles between planned blanket replacements, N - n = fwbsv.life_blkt_fpy * YEAR_SECONDS / tv.t_cycle + n = fwbsv.life_blkt_fpy * YEAR_SECONDS / tv.t_plant_pulse_total # The probability of failure in one pulse cycle # (before the reference cycle life) - pf = (cv.fwbs_prob_fail / DAY_SECONDS) * tv.t_cycle - a0 = 1.0e0 - pf * cv.fwbs_umain_time * YEAR_SECONDS / tv.t_cycle + pf = (cv.fwbs_prob_fail / DAY_SECONDS) * tv.t_plant_pulse_total + a0 = 1.0e0 - pf * cv.fwbs_umain_time * YEAR_SECONDS / tv.t_plant_pulse_total if cv.fwbs_nu <= cv.fwbs_nref: logger.error( @@ -1146,7 +1146,7 @@ def avail_st(self, output: bool): cv.cplife = min(cv.cplife / cv.cfactr, cv.tlife) # Capacity factor - cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_cycle) + cv.cpfact = cv.cfactr * (tv.t_plant_pulse_burn / tv.t_plant_pulse_total) if output: po.ocmmnt(self.outfile, "Plant Availability") diff --git a/process/constraints.py b/process/constraints.py index 5b696a46a0..316f3d0f74 100644 --- a/process/constraints.py +++ b/process/constraints.py @@ -1248,7 +1248,7 @@ def constraint_equation_42(): author: P B Lloyd, CCFE, Culham Science Centre ft_cycle_min: f-value for cycle time - t_cycle: full cycle time (s) + t_plant_pulse_total: full cycle time (s) t_cycle_min: minimum cycle time (s) """ if data_structure.constraint_variables.t_cycle_min < 1.0: @@ -1259,7 +1259,7 @@ def constraint_equation_42(): cc = ( 1.0 - data_structure.constraint_variables.ft_cycle_min - * data_structure.times_variables.t_cycle + * data_structure.times_variables.t_plant_pulse_total / data_structure.constraint_variables.t_cycle_min ) return ConstraintResult( diff --git a/process/costs.py b/process/costs.py index bb10b4926f..2e08267e15 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2868,7 +2868,7 @@ def coelc(self): * (24.0e0 * constants.N_DAY_YEAR) * cost_variables.cfactr * times_variables.t_plant_pulse_burn - / times_variables.t_cycle + / times_variables.t_plant_pulse_total ) # Costs due to reactor plant diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index 686704a7e8..a953481cc1 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -12,8 +12,8 @@ t_burn_0: float = None """burn time (s) - used for internal consistency""" -t_cycle: float = None -"""full cycle time (s)""" +t_plant_pulse_total: float = None +"""Total plant pulse cycle time (s)""" tdown: float = None """down time (s)""" @@ -58,7 +58,7 @@ def init_times_variables(): global pulsetimings global t_plant_pulse_burn global t_burn_0 - global t_cycle + global t_plant_pulse_total global tdown global t_between_pulse global t_plant_pulse_fusion_ramp @@ -74,7 +74,7 @@ def init_times_variables(): pulsetimings = 1.0 t_plant_pulse_burn = np.array(1000.0, dtype=np.float64) t_burn_0 = 0.0 - t_cycle = np.array(0.0, dtype=np.float64) + t_plant_pulse_total = np.array(0.0, dtype=np.float64) tdown = 0.0 t_between_pulse = 1800.0 t_plant_pulse_fusion_ramp = 10.0 diff --git a/process/physics.py b/process/physics.py index f9a9ba75a8..0b679340ad 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1889,7 +1889,7 @@ def physics(self): ) # Total cycle time - times_variables.t_cycle = ( + times_variables.t_plant_pulse_total = ( times_variables.t_plant_pulse_coil_precharge + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp @@ -3908,8 +3908,8 @@ def outtim(self): po.ovarre( self.outfile, "Total plant cycle time (s)", - "(t_cycle)", - times_variables.t_cycle, + "(t_plant_pulse_total)", + times_variables.t_plant_pulse_total, "OP ", ) diff --git a/process/stellarator.py b/process/stellarator.py index 9151a5fcde..ff5bb01941 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5914,7 +5914,7 @@ def stinit(): + times_variables.t_plant_pulse_plasma_current_ramp_down + times_variables.t_between_pulse ) - times_variables.t_cycle = ( + times_variables.t_plant_pulse_total = ( times_variables.t_plant_pulse_coil_precharge + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 39b3bae9dd..05e137d289 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3209,7 +3209,7 @@ t_between_pulse = 100.0 *icc = 42 * DESCRIPTION: Constraint equation for full pulse cycle time lower limit. * JUSTIFICATION: Turned off, do not care about the full pulse cycle time -* VARIABLES: t_cycle (s) calculated in-situ +* VARIABLES: t_plant_pulse_total (s) calculated in-situ *t_cycle_min = * DESCRIPTION: Minimum full pulse cycle time (s) diff --git a/tests/unit/test_availability.py b/tests/unit/test_availability.py index cc245e4fc7..957fea093e 100644 --- a/tests/unit/test_availability.py +++ b/tests/unit/test_availability.py @@ -50,7 +50,7 @@ def test_avail_0(monkeypatch, availability, life_fw_fpy, ibkt_life, bktlife_exp_ monkeypatch.setattr(cv, "life_dpa", 40.0) monkeypatch.setattr(cv, "adivflnc", 8.0) monkeypatch.setattr(dv, "pflux_div_heat_load_mw", 10.0) - monkeypatch.setattr(tv, "t_cycle", 5.0) + monkeypatch.setattr(tv, "t_plant_pulse_total", 5.0) monkeypatch.setattr(cv, "iavail", 0) monkeypatch.setattr(cv, "cfactr", 0.8) monkeypatch.setattr(tv, "t_plant_pulse_burn", 500.0) @@ -347,7 +347,11 @@ def calc_u_unplanned_divertor_param(**kwargs): :rtype: dict """ # Default parameters - defaults = {"divlife": 1.99, "t_cycle": 9000, "expected": approx(0.02, abs=0.005)} + defaults = { + "divlife": 1.99, + "t_plant_pulse_total": 9000, + "expected": approx(0.02, abs=0.005), + } # Merge default dict with any optional keyword arguments to override values return {**defaults, **kwargs} @@ -388,7 +392,7 @@ def calc_u_unplanned_divertor_fix(request, monkeypatch): # Mock variables used by calc_u_unplanned_divertor() # Some may be parameterised - monkeypatch.setattr(tv, "t_cycle", param["t_cycle"]) + monkeypatch.setattr(tv, "t_plant_pulse_total", param["t_plant_pulse_total"]) monkeypatch.setattr(cv, "divlife", param["divlife"]) # Return the expected result for the given parameter list @@ -421,7 +425,7 @@ def calc_u_unplanned_fwbs_param(**kwargs): # Default parameters defaults = { "life_blkt_fpy": 5, - "t_cycle": 9000, + "t_plant_pulse_total": 9000, "expected": approx(0.02, abs=0.005), } @@ -463,7 +467,7 @@ def calc_u_unplanned_fwbs_fix(request, monkeypatch): # Mock variables used by calc_u_unplanned_fwbs() # Some may be parameterised - monkeypatch.setattr(tv, "t_cycle", param["t_cycle"]) + monkeypatch.setattr(tv, "t_plant_pulse_total", param["t_plant_pulse_total"]) monkeypatch.setattr( data_structure.fwbs_variables, "life_blkt_fpy", param["life_blkt_fpy"] ) @@ -539,7 +543,7 @@ def mock_calc_u_unplanned_vacuum(*args, **kwargs): # Mock module variables monkeypatch.setattr(tv, "t_plant_pulse_burn", 5.0) - monkeypatch.setattr(tv, "t_cycle", 50.0) + monkeypatch.setattr(tv, "t_plant_pulse_total", 50.0) monkeypatch.setattr(ifev, "ife", 0) monkeypatch.setattr(pv, "itart", 1) monkeypatch.setattr(fwbsv, "life_blkt_fpy", 5.0) @@ -584,7 +588,7 @@ def test_avail_st(monkeypatch, availability): monkeypatch.setattr(cv, "tlife", 30.0) monkeypatch.setattr(cv, "u_unplanned_cp", 0.05) monkeypatch.setattr(tv, "t_plant_pulse_burn", 5.0) - monkeypatch.setattr(tv, "t_cycle", 9000.0) + monkeypatch.setattr(tv, "t_plant_pulse_total", 9000.0) monkeypatch.setattr(cv, "adivflnc", 10.0) monkeypatch.setattr(dv, "pflux_div_heat_load_mw", 10.0) monkeypatch.setattr(cv, "ibkt_life", 0) diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 6dfce10b46..1ef831d8ea 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -5615,7 +5615,7 @@ class CoelcParam(NamedTuple): f_plasma_fuel_helium3: Any = None - t_cycle: Any = None + t_plant_pulse_total: Any = None t_plant_pulse_burn: Any = None @@ -5711,7 +5711,7 @@ class CoelcParam(NamedTuple): itart=0, wtgpd=507.88376577416528, f_plasma_fuel_helium3=0, - t_cycle=10864.426139387357, + t_plant_pulse_total=10864.426139387357, t_plant_pulse_burn=0, outfile=11, expected_coeoam=4.4099029328740929e20, @@ -5795,7 +5795,7 @@ class CoelcParam(NamedTuple): itart=0, wtgpd=507.72524666099866, f_plasma_fuel_helium3=0, - t_cycle=864.42613938735622, + t_plant_pulse_total=864.42613938735622, t_plant_pulse_burn=10230.533336387549, outfile=11, expected_coeoam=1.2419424614419636, @@ -5916,7 +5916,9 @@ def test_coelc(coelcparam, monkeypatch, costs): physics_variables, "f_plasma_fuel_helium3", coelcparam.f_plasma_fuel_helium3 ) - monkeypatch.setattr(times_variables, "t_cycle", coelcparam.t_cycle) + monkeypatch.setattr( + times_variables, "t_plant_pulse_total", coelcparam.t_plant_pulse_total + ) monkeypatch.setattr( times_variables, "t_plant_pulse_burn", coelcparam.t_plant_pulse_burn From 445a099cc720d955841184b24cf1fb8a36849c74 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 15:16:03 +0100 Subject: [PATCH 07/13] =?UTF-8?q?=F0=9F=94=84=20-=20Rename=20`tdown`=20to?= =?UTF-8?q?=20`t=5Fplant=5Fpulse=5Fno=5Fburn`=20across=20multiple=20files?= =?UTF-8?q?=20for=20consistency=20with=20updated=20terminology.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 2 +- process/data_structure/times_variables.py | 8 ++++---- process/physics.py | 2 +- process/stellarator.py | 2 +- tests/unit/test_costs_1990.py | 20 ++++++++++++-------- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/process/costs.py b/process/costs.py index 2e08267e15..0c6c2530f2 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2816,7 +2816,7 @@ def acc2253(self): cost_variables.c2253 = ( cost_variables.ucblss * (heat_transport_variables.p_plant_primary_heat_mw * 1.0e6) - * times_variables.tdown + * times_variables.t_plant_pulse_no_burn / (shcss * pulse_variables.dtstor) ) diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index a953481cc1..e88ee36956 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -15,8 +15,8 @@ t_plant_pulse_total: float = None """Total plant pulse cycle time (s)""" -tdown: float = None -"""down time (s)""" +t_plant_pulse_no_burn: float = None +"""Plant pulse time spent not a flat-top burn phase (s)""" t_between_pulse: float = None """time between pulses in a pulsed reactor (s) (`iteration variable 17`)""" @@ -59,7 +59,7 @@ def init_times_variables(): global t_plant_pulse_burn global t_burn_0 global t_plant_pulse_total - global tdown + global t_plant_pulse_no_burn global t_between_pulse global t_plant_pulse_fusion_ramp global t_pulse_cumulative @@ -75,7 +75,7 @@ def init_times_variables(): t_plant_pulse_burn = np.array(1000.0, dtype=np.float64) t_burn_0 = 0.0 t_plant_pulse_total = np.array(0.0, dtype=np.float64) - tdown = 0.0 + t_plant_pulse_no_burn = 0.0 t_between_pulse = 1800.0 t_plant_pulse_fusion_ramp = 10.0 t_pulse_cumulative = np.zeros(6, dtype=np.float64) diff --git a/process/physics.py b/process/physics.py index 0b679340ad..feda9ecce3 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1881,7 +1881,7 @@ def physics(self): + times_variables.t_plant_pulse_burn + times_variables.t_plant_pulse_plasma_current_ramp_down ) - times_variables.tdown = ( + times_variables.t_plant_pulse_no_burn = ( times_variables.t_plant_pulse_coil_precharge + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_down diff --git a/process/stellarator.py b/process/stellarator.py index ff5bb01941..9b6a38f7e9 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5908,7 +5908,7 @@ def stinit(): + times_variables.t_plant_pulse_burn + times_variables.t_plant_pulse_plasma_current_ramp_down ) - times_variables.tdown = ( + times_variables.t_plant_pulse_no_burn = ( times_variables.t_plant_pulse_coil_precharge + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_down diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 1ef831d8ea..5ed3e2cd07 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -3700,7 +3700,7 @@ class Acc2253Param(NamedTuple): istore: Any = None - tdown: Any = None + t_plant_pulse_no_burn: Any = None c22: Any = None @@ -3722,7 +3722,7 @@ class Acc2253Param(NamedTuple): i_pulsed_plant=1, dtstor=300, istore=1, - tdown=854.42613938735622, + t_plant_pulse_no_burn=854.42613938735622, c22=0, c225=0, c2253=0, @@ -3736,7 +3736,7 @@ class Acc2253Param(NamedTuple): i_pulsed_plant=1, dtstor=300, istore=1, - tdown=854.42613938735622, + t_plant_pulse_no_burn=854.42613938735622, c22=3474.7391916096453, c225=185.05656643685359, c2253=20.785622343242554, @@ -3779,7 +3779,9 @@ def test_acc2253(acc2253param, monkeypatch, costs): monkeypatch.setattr(pulse_variables, "istore", acc2253param.istore) - monkeypatch.setattr(times_variables, "tdown", acc2253param.tdown) + monkeypatch.setattr( + times_variables, "t_plant_pulse_no_burn", acc2253param.t_plant_pulse_no_burn + ) monkeypatch.setattr(cost_variables, "c22", acc2253param.c22) @@ -5432,7 +5434,7 @@ class Acc2253Param(NamedTuple): istore: Any = None - tdown: Any = None + t_plant_pulse_no_burn: Any = None c22: Any = None @@ -5454,7 +5456,7 @@ class Acc2253Param(NamedTuple): i_pulsed_plant=1, dtstor=300, istore=1, - tdown=854.42613938735622, + t_plant_pulse_no_burn=854.42613938735622, c22=0, c225=0, c2253=0, @@ -5468,7 +5470,7 @@ class Acc2253Param(NamedTuple): i_pulsed_plant=1, dtstor=300, istore=1, - tdown=854.42613938735622, + t_plant_pulse_no_burn=854.42613938735622, c22=3474.7391916096453, c225=185.05656643685359, c2253=20.785622343242554, @@ -5511,7 +5513,9 @@ def test_acc2253_urt(acc2253param, monkeypatch, costs): monkeypatch.setattr(pulse_variables, "istore", acc2253param.istore) - monkeypatch.setattr(times_variables, "tdown", acc2253param.tdown) + monkeypatch.setattr( + times_variables, "t_plant_pulse_no_burn", acc2253param.t_plant_pulse_no_burn + ) monkeypatch.setattr(cost_variables, "c22", acc2253param.c22) From 2eee9edabc5c686d63f24cd694eb1cbc6ea26971 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 15:17:13 +0100 Subject: [PATCH 08/13] :bug: Add fusion ramp time to non burn time --- process/physics.py | 1 + process/stellarator.py | 1 + 2 files changed, 2 insertions(+) diff --git a/process/physics.py b/process/physics.py index feda9ecce3..93e78ed3d3 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1886,6 +1886,7 @@ def physics(self): + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_down + times_variables.t_between_pulse + + times_variables.t_plant_pulse_fusion_ramp ) # Total cycle time diff --git a/process/stellarator.py b/process/stellarator.py index 9b6a38f7e9..cf8d6b0999 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5913,6 +5913,7 @@ def stinit(): + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_down + times_variables.t_between_pulse + + times_variables.t_plant_pulse_fusion_ramp ) times_variables.t_plant_pulse_total = ( times_variables.t_plant_pulse_coil_precharge From 797afabf43e082c556d920a9f882dda58efd7ae2 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 15:21:11 +0100 Subject: [PATCH 09/13] =?UTF-8?q?=F0=9F=94=84=20-=20Rename=20`t=5Fpulse=5F?= =?UTF-8?q?repetition`=20to=20`t=5Fplant=5Fpulse=5Fplasma=5Fpresent`=20acr?= =?UTF-8?q?oss=20multiple=20files=20for=20consistency=20with=20updated=20t?= =?UTF-8?q?erminology.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../power-conversion-and-heat-dissipation-systems.md | 2 +- process/data_structure/times_variables.py | 8 ++++---- process/physics.py | 6 ++---- process/power.py | 8 ++++---- process/stellarator.py | 2 +- tests/unit/test_power.py | 8 ++++---- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/documentation/eng-models/power-conversion-and-heat-dissipation-systems.md b/documentation/eng-models/power-conversion-and-heat-dissipation-systems.md index 02d94457e6..53be7501a7 100644 --- a/documentation/eng-models/power-conversion-and-heat-dissipation-systems.md +++ b/documentation/eng-models/power-conversion-and-heat-dissipation-systems.md @@ -114,6 +114,6 @@ The recirculating power comprises the electrical power required to run all of th electrical systems surrounding the fusion power core, plus the on-site building services, offices, etc., as shown in Figure 1. Of these, the cryogenic plant power includes the power required to cool the TF coils from the neutron power absorbed by the coils, the PF coils (as defined by the ratio of -the total PF coil stored energy to the fusion power pulse time `t_pulse_repetition`), and other 'cold' components. +the total PF coil stored energy to the fusion power pulse time `t_plant_pulse_plasma_present`), and other 'cold' components. [^1]: C. Harrington, *"Development and Implementation of Improved Balance of Plant Models for PROCESS"*, CCFE C5.M15 Milestone Report, August 2014 (copy stored as CCFE internal note T&M/PKNIGHT/PROCESS/027) diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index e88ee36956..b743bc9607 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -42,8 +42,8 @@ - = 0, t_plant_pulse_plasma_current_ramp_up = t_plant_pulse_coil_precharge = t_plant_pulse_plasma_current_ramp_down = Ip(MA)/0.5 - = 1, t_plant_pulse_plasma_current_ramp_up, t_plant_pulse_coil_precharge, t_plant_pulse_plasma_current_ramp_down are input""" -t_pulse_repetition: float = None -"""pulse length = t_plant_pulse_plasma_current_ramp_up + t_plant_pulse_fusion_ramp + t_plant_pulse_burn + t_plant_pulse_plasma_current_ramp_down""" +t_plant_pulse_plasma_present: float = None +"""Plant pulse time in which a plasma is present (s)""" t_plant_pulse_plasma_current_ramp_down: float = None """Plant pulse time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_plant_pulse_plasma_current_ramp_up @@ -67,7 +67,7 @@ def init_times_variables(): global intervallabel global t_plant_pulse_plasma_current_ramp_up global i_t_current_ramp_up - global t_pulse_repetition + global t_plant_pulse_plasma_present global t_plant_pulse_plasma_current_ramp_down global t_plant_pulse_coil_precharge @@ -89,6 +89,6 @@ def init_times_variables(): ] t_plant_pulse_plasma_current_ramp_up = 30.0 i_t_current_ramp_up = 0 - t_pulse_repetition = 0.0 + t_plant_pulse_plasma_present = 0.0 t_plant_pulse_plasma_current_ramp_down = 15.0 t_plant_pulse_coil_precharge = 15.0 diff --git a/process/physics.py b/process/physics.py index 93e78ed3d3..bfdde502ed 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1872,10 +1872,8 @@ def physics(self): # see convergence loop in fcnvmc1, evaluators.f90 times_variables.t_burn_0 = times_variables.t_plant_pulse_burn - # Pulse and down times : The reactor is assumed to be 'down' - # at all times outside of the plasma current flat-top period. - # The pulse length is the duration of non-zero plasma current - times_variables.t_pulse_repetition = ( + # Time during the pulse in which a plasma is present + times_variables.t_plant_pulse_plasma_present = ( times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn diff --git a/process/power.py b/process/power.py index f7bf6ed0c0..7e08e455b2 100644 --- a/process/power.py +++ b/process/power.py @@ -756,7 +756,7 @@ def calculate_cryo_loads(self) -> None: structure_variables.coldmass, fwbs_variables.p_tf_nuclear_heat_mw, pf_power_variables.ensxpfm, - times_variables.t_pulse_repetition, + times_variables.t_plant_pulse_plasma_present, tfcoil_variables.c_tf_turn, tfcoil_variables.n_tf_coils, ) @@ -1415,7 +1415,7 @@ def cryo( coldmass, p_tf_nuclear_heat_mw, ensxpfm, - t_pulse_repetition, + t_plant_pulse_plasma_present, c_tf_turn, n_tf_coils, ): @@ -1430,7 +1430,7 @@ def cryo( intercoil structure p_tf_nuclear_heat_mw : input real : Nuclear heating in TF coils (MW) ensxpfm : input real : Maximum PF coil stored energy (MJ) - t_pulse_repetition : input real : Pulse length of cycle (s) + t_plant_pulse_plasma_present : input real : Pulse length of cycle (s) c_tf_turn : input real : Current per turn in TF coils (A) tfno : input real : Number of TF coils helpow : output real : Helium heat removal at cryo temperatures (W) @@ -1447,7 +1447,7 @@ def cryo( # Issue #511: if fwbs_variables.inuclear = 1 : fwbs_variables.qnuc is input. # AC losses - power_variables.qac = 1.0e3 * ensxpfm / t_pulse_repetition + power_variables.qac = 1.0e3 * ensxpfm / t_plant_pulse_plasma_present # Current leads if i_tf_sup == 1: diff --git a/process/stellarator.py b/process/stellarator.py index cf8d6b0999..c3ed32c12f 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5902,7 +5902,7 @@ def stinit(): times_variables.t_plant_pulse_plasma_current_ramp_up = 0.0 times_variables.t_plant_pulse_burn = 3.15576e7 # one year times_variables.t_plant_pulse_plasma_current_ramp_down = 0.0 - times_variables.t_pulse_repetition = ( + times_variables.t_plant_pulse_plasma_present = ( times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index b890e525df..506c6105e4 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -60,7 +60,7 @@ class CryoParam(NamedTuple): tfcryoarea: Any = None - t_pulse_repetition: Any = None + t_plant_pulse_plasma_present: Any = None expected_qss: Any = None @@ -90,7 +90,7 @@ class CryoParam(NamedTuple): p_tf_nuclear_heat_mw=0.044178296011112193, n_tf_coils=16, tfcryoarea=0, - t_pulse_repetition=10364.426139387357, + t_plant_pulse_plasma_present=10364.426139387357, expected_qss=20361.633927097802, expected_qac=3611.3456752656607, expected_qcl=16108.2211128, @@ -111,7 +111,7 @@ class CryoParam(NamedTuple): p_tf_nuclear_heat_mw=0.045535131445547841, n_tf_coils=16, tfcryoarea=0, - t_pulse_repetition=364.42613938735633, + t_plant_pulse_plasma_present=364.42613938735633, expected_qss=20342.863776957758, expected_qac=102701.82327748176, expected_qcl=16108.2211128, @@ -153,7 +153,7 @@ def test_cryo(cryoparam, monkeypatch, power): p_tf_nuclear_heat_mw=cryoparam.p_tf_nuclear_heat_mw, n_tf_coils=cryoparam.n_tf_coils, tfcryoarea=cryoparam.tfcryoarea, - t_pulse_repetition=cryoparam.t_pulse_repetition, + t_plant_pulse_plasma_present=cryoparam.t_plant_pulse_plasma_present, ) assert power_variables.qss == pytest.approx(cryoparam.expected_qss) From 3870083fc3d605704d8207197a0e92588c36d505 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 16 Oct 2025 15:25:21 +0100 Subject: [PATCH 10/13] =?UTF-8?q?=F0=9F=94=84=20-=20Updated=20variable=20n?= =?UTF-8?q?ames=20from=20`t=5Fbetween=5Fpulse`=20to=20`t=5Fplant=5Fpulse?= =?UTF-8?q?=5Fdwell`=20across=20multiple=20files=20to=20enhance=20readabil?= =?UTF-8?q?ity=20and=20consistency=20in=20the=20codebase.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/physics-models/pulsed-plant.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 6 ++--- examples/data/large_tokamak_1_MFILE.DAT | 6 ++--- examples/data/large_tokamak_2_MFILE.DAT | 6 ++--- examples/data/large_tokamak_3_MFILE.DAT | 6 ++--- examples/data/large_tokamak_4_MFILE.DAT | 6 ++--- examples/data/large_tokamak_eval_IN.DAT | 2 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 6 ++--- examples/data/large_tokamak_nof_MFILE.DAT | 6 ++--- process/data_structure/numerics.py | 2 +- process/data_structure/times_variables.py | 8 +++--- process/data_structure/vacuum_variables.py | 4 +-- process/input.py | 2 +- process/io/obsolete_vars.py | 2 +- process/iteration_variables.py | 2 +- process/physics.py | 8 +++--- process/stellarator.py | 4 +-- process/vacuum.py | 25 +++++++++++-------- .../data/large_tokamak_eval.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_eval.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../input_files/spherical_tokamak_eval.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 6 ++--- tests/unit/test_vacuum.py | 6 ++--- 25 files changed, 64 insertions(+), 61 deletions(-) diff --git a/documentation/physics-models/pulsed-plant.md b/documentation/physics-models/pulsed-plant.md index 2bd5a84b20..047a5e0e3f 100644 --- a/documentation/physics-models/pulsed-plant.md +++ b/documentation/physics-models/pulsed-plant.md @@ -60,7 +60,7 @@ Over the course of a pulse, the timings are detailed as: - Fusion ramp (`t_plant_pulse_fusion_ramp`) - The plasma temperature and density rise to the full values. The CS and other PF coil currents all change steadily. Auxiliary heating is on. - Burn time (`t_plant_pulse_burn`) - Flat-top duration. The plasma is approximately steady. Fusion power and electricity are produced. The CS and other PF coil currents all change steadily in a pulsed reactor, but are constant for a "steady-state" reactor. Auxiliary heating is on. - Ramp-down (`t_plant_pulse_plasma_current_ramp_down`) - The plasma current, density and temperature all ramp down to zero simultaneously. As a starter for ten we could assume that the CS and PF coil currents also ramp to zero at the same time. Auxiliary heating is possibly on. -- Between pulse (`t_between_pulse`) - CS and PF coil currents are zero - a few minutes may be required to permit vacuum pumping. May be much longer for an experimental device such as DEMO. +- Between pulse (`t_plant_pulse_dwell`) - CS and PF coil currents are zero - a few minutes may be required to permit vacuum pumping. May be much longer for an experimental device such as DEMO. - Pulse repitition (`t_pulse_repitition`) - Sum of all the above times. A plot showing schematically these timings over a pulse can be found in Figure 2. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7357511663..e9691792a4 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -562,7 +562,7 @@ Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.1999E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6699E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8441E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -1048,7 +1048,7 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6766E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6766E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP @@ -1631,7 +1631,7 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwellwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index c139251d40..1c375adcde 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -560,7 +560,7 @@ Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,7 +1043,7 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP @@ -1625,7 +1625,7 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwellwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 8db3ee0b2a..3198cf545e 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -560,7 +560,7 @@ Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,7 +1043,7 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP @@ -1625,7 +1625,7 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwellwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index cc11e03efe..8f43b1f4ea 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -560,7 +560,7 @@ Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,7 +1043,7 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP @@ -1626,7 +1626,7 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwellwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index b54f1937a2..96303a6ec8 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -560,7 +560,7 @@ Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,7 +1043,7 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP @@ -1626,7 +1626,7 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwellwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 diff --git a/examples/data/large_tokamak_eval_IN.DAT b/examples/data/large_tokamak_eval_IN.DAT index 667eb26a17..b81cc594c6 100644 --- a/examples/data/large_tokamak_eval_IN.DAT +++ b/examples/data/large_tokamak_eval_IN.DAT @@ -392,7 +392,7 @@ f_a_tf_turn_cable_space_extra_void = 0.3 * coolant fraction of TFC 'cable' ( *-----------------Times Variables------------------* pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); -t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) +t_plant_pulse_dwellwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index 6811e36989..e27689c753 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -455,7 +455,7 @@ Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.60910954080422698e+02 - Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 + Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwellwell)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 8.76211449542915943e+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -999,7 +999,7 @@ Chamber_pressure_after_burn_(Pa)_________________________________________ (pend)_________________________ 1.61381834730617624e-01 OP Chamber_pressure_before_burn_(Pa)________________________________________ (pstart)_______________________ 1.61381834730617638e-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)_____________________________________________ (t_between_pulse.)_____________ 1.80000000000000000e+03 + Dwell_time_between_burns_(s)_____________________________________________ (t_plant_pulse_dwellwell.)_____________ 1.80000000000000000e+03 CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)_________________ 5.00000000000000000e+02 Allowable_pumping_time_between_burns_(s)_________________________________ (tpump)________________________ 1.80000000000000000e+03 Required_D-T_pump_speed_(m3/s)___________________________________________ (s(2))_________________________ 5.77897305930929406e+00 OP @@ -1572,7 +1572,7 @@ f_a_tf_turn_cable_space_extra_void = 0.3 * coolant fraction of TFC 'cable' ( *-----------------Times Variables------------------* pulsetimings = 0 * Switch for pulse timings (if lpulse=1); -t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) +t_plant_pulse_dwellwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index 3fca7c5aaa..30211b3d14 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -529,7 +529,7 @@ Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.75262350092394996e+02 - Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 + Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwellwell)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 1.00054568371814421e+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -1073,7 +1073,7 @@ Chamber_pressure_after_burn_(Pa)_________________________________________ (pend)_________________________ 1.75966345086182835e-01 OP Chamber_pressure_before_burn_(Pa)________________________________________ (pstart)_______________________ 1.75966345086182841e-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)_____________________________________________ (t_between_pulse.)_____________ 1.80000000000000000e+03 + Dwell_time_between_burns_(s)_____________________________________________ (t_plant_pulse_dwellwell.)_____________ 1.80000000000000000e+03 CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)_________________ 5.00000000000000000e+02 Allowable_pumping_time_between_burns_(s)_________________________________ (tpump)________________________ 1.80000000000000000e+03 Required_D-T_pump_speed_(m3/s)___________________________________________ (s(2))_________________________ 5.77897305930929495e+00 OP @@ -1635,7 +1635,7 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwellwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 diff --git a/process/data_structure/numerics.py b/process/data_structure/numerics.py index 3d477b847a..a4805e9c03 100644 --- a/process/data_structure/numerics.py +++ b/process/data_structure/numerics.py @@ -213,7 +213,7 @@ * (14) fpflux_fw_neutron_max_mw (f-value for equation 8) * (15) fvs_plasma_total_required (f-value for equation 12) * (16) dr_cs -* (17) t_between_pulse +* (17) t_plant_pulse_dwell * (18) q * (19) e_beam_kev * (20) temp_cp_average diff --git a/process/data_structure/times_variables.py b/process/data_structure/times_variables.py index b743bc9607..73ceafa791 100644 --- a/process/data_structure/times_variables.py +++ b/process/data_structure/times_variables.py @@ -18,8 +18,8 @@ t_plant_pulse_no_burn: float = None """Plant pulse time spent not a flat-top burn phase (s)""" -t_between_pulse: float = None -"""time between pulses in a pulsed reactor (s) (`iteration variable 17`)""" +t_plant_pulse_dwell: float = None +"""Plant pulse dwell time before start of next pulse (s) (`iteration variable 17`)""" t_plant_pulse_fusion_ramp: float = None """time for plasma temperature and density rise to full values (s)""" @@ -60,7 +60,7 @@ def init_times_variables(): global t_burn_0 global t_plant_pulse_total global t_plant_pulse_no_burn - global t_between_pulse + global t_plant_pulse_dwell global t_plant_pulse_fusion_ramp global t_pulse_cumulative global timelabel @@ -76,7 +76,7 @@ def init_times_variables(): t_burn_0 = 0.0 t_plant_pulse_total = np.array(0.0, dtype=np.float64) t_plant_pulse_no_burn = 0.0 - t_between_pulse = 1800.0 + t_plant_pulse_dwell = 1800.0 t_plant_pulse_fusion_ramp = 10.0 t_pulse_cumulative = np.zeros(6, dtype=np.float64) timelabel = ["Start", "BOP ", "EOR ", "BOF ", "EOF ", "EOP "] diff --git a/process/data_structure/vacuum_variables.py b/process/data_structure/vacuum_variables.py index b9a45ada79..bd7eaad2c5 100644 --- a/process/data_structure/vacuum_variables.py +++ b/process/data_structure/vacuum_variables.py @@ -53,9 +53,9 @@ i_vac_pump_dwell: int = None """switch for dwell pumping options: - - =0 pumping only during t_between_pulse + - =0 pumping only during t_plant_pulse_dwell - =1 pumping only during t_plant_pulse_coil_precharge - - =2 pumping during t_between_pulse + t_plant_pulse_coil_precharge + - =2 pumping during t_plant_pulse_dwell + t_plant_pulse_coil_precharge The following are used in the Battes, Day and Rohde pump-down model See "Basic considerations on the pump-down time in the dwell phase of a pulsed fusion DEMO" diff --git a/process/input.py b/process/input.py index bea26e0d52..e79574f251 100644 --- a/process/input.py +++ b/process/input.py @@ -1587,7 +1587,7 @@ def __post_init__(self): "str_wp_max": InputVariable( data_structure.tfcoil_variables, float, range=(0.0, 0.3) ), - "t_between_pulse": InputVariable( + "t_plant_pulse_dwell": InputVariable( data_structure.times_variables, float, range=(0.0, 100000000.0) ), "t_plant_pulse_burn": InputVariable( diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index ec833cab4f..bbba669882 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -138,7 +138,7 @@ "ftohs": "ft_current_ramp_up", "tbrnmn": "t_burn_min", "tohs": "t_plant_pulse_plasma_current_ramp_up", - "tdwell": "t_between_pulse", + "tdwell": "t_plant_pulse_dwell", "tramp": "t_plant_pulse_coil_precharge", "tqnch": "t_plant_pulse_plasma_current_ramp_down", "tburn": "t_plant_pulse_burn", diff --git a/process/iteration_variables.py b/process/iteration_variables.py index c3b5da26e8..07c59ec082 100644 --- a/process/iteration_variables.py +++ b/process/iteration_variables.py @@ -70,7 +70,7 @@ class IterationVariable: ), 16: IterationVariable("dr_cs", data_structure.build_variables, 0.01, 10.00), 17: IterationVariable( - "t_between_pulse", data_structure.times_variables, 0.1, 1.0e8 + "t_plant_pulse_dwell", data_structure.times_variables, 0.1, 1.0e8 ), 18: IterationVariable("q95", data_structure.physics_variables, 2.0, 50.00), 19: IterationVariable( diff --git a/process/physics.py b/process/physics.py index bfdde502ed..5b7acebbae 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1883,7 +1883,7 @@ def physics(self): times_variables.t_plant_pulse_coil_precharge + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_down - + times_variables.t_between_pulse + + times_variables.t_plant_pulse_dwell + times_variables.t_plant_pulse_fusion_ramp ) @@ -1894,7 +1894,7 @@ def physics(self): + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_plant_pulse_plasma_current_ramp_down - + times_variables.t_between_pulse + + times_variables.t_plant_pulse_dwell ) # ***************************** # @@ -3900,8 +3900,8 @@ def outtim(self): po.ovarrf( self.outfile, "Time between pulses (s)", - "(t_between_pulse)", - times_variables.t_between_pulse, + "(t_plant_pulse_dwell)", + times_variables.t_plant_pulse_dwell, ) po.oblnkl(self.outfile) po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index c3ed32c12f..9d9291d288 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -5912,7 +5912,7 @@ def stinit(): times_variables.t_plant_pulse_coil_precharge + times_variables.t_plant_pulse_plasma_current_ramp_up + times_variables.t_plant_pulse_plasma_current_ramp_down - + times_variables.t_between_pulse + + times_variables.t_plant_pulse_dwell + times_variables.t_plant_pulse_fusion_ramp ) times_variables.t_plant_pulse_total = ( @@ -5921,5 +5921,5 @@ def stinit(): + times_variables.t_plant_pulse_fusion_ramp + times_variables.t_plant_pulse_burn + times_variables.t_plant_pulse_plasma_current_ramp_down - + times_variables.t_between_pulse + + times_variables.t_plant_pulse_dwell ) diff --git a/process/vacuum.py b/process/vacuum.py index 205b4b8ac9..2e884980e7 100644 --- a/process/vacuum.py +++ b/process/vacuum.py @@ -72,7 +72,7 @@ def run(self, output: bool) -> None: buv.dr_tf_inboard, buv.rsldi - buv.dr_shld_vv_gap_inboard - buv.dr_vv_inboard, tfv.n_tf_coils, - tv.t_between_pulse, + tv.t_plant_pulse_dwell, pv.nd_plasma_electrons_vol_avg, pv.n_divertors, qtorus, @@ -118,7 +118,7 @@ def vacuum_simple(self, output) -> float: # Required pumping speed for pump-down pumpdownspeed = ( vacv.outgasfactor * wallarea / vacv.pres_vv_chamber_base - ) * tv.t_between_pulse ** (-vacv.outgasindex) + ) * tv.t_plant_pulse_dwell ** (-vacv.outgasindex) # Number of pumps required for pump-down npumpdown = pumpdownspeed / pumpspeed @@ -162,7 +162,10 @@ def vacuum_simple(self, output) -> float: ) po.ovarre( - self.outfile, "Dwell time", "(t_between_pulse)", tv.t_between_pulse + self.outfile, + "Dwell time", + "(t_plant_pulse_dwell)", + tv.t_plant_pulse_dwell, ) po.ovarre( self.outfile, @@ -194,7 +197,7 @@ def vacuum( thtf, ritf, n_tf_coils, - t_between_pulse, + t_plant_pulse_dwell, nplasma, ndiv, qtorus, @@ -243,7 +246,7 @@ def vacuum( :param tfno: Number of TF coils :type : int - :param t_between_pulse: Dwell time between pulses (s) + :param t_plant_pulse_dwell: Dwell time between pulses (s) :type : float :param nplasma: Plasma density (m**-3) @@ -332,7 +335,7 @@ def vacuum( # Pumpdown between burns # s(2) = net pump speed (DT) required for pumpdown between burns (m^3/s) # temp_vv_chamber_gas_burn_end = temperature of neutral gas in chamber (K) - # t_between_pulse = dwell time between burns (s) + # t_plant_pulse_dwell = dwell time between burns (s) pend = ( 0.5e0 * nplasma * k * vacv.temp_vv_chamber_gas_burn_end @@ -346,12 +349,12 @@ def vacuum( volume = plasma_vol * (aw + dsol) * (aw + dsol) / (aw * aw) # dwell pumping options - if (vacv.i_vac_pump_dwell == 1) or (t_between_pulse == 0): + if (vacv.i_vac_pump_dwell == 1) or (t_plant_pulse_dwell == 0): tpump = tv.t_plant_pulse_coil_precharge elif vacv.i_vac_pump_dwell == 2: - tpump = t_between_pulse + tv.t_plant_pulse_coil_precharge + tpump = t_plant_pulse_dwell + tv.t_plant_pulse_coil_precharge else: - tpump = t_between_pulse + tpump = t_plant_pulse_dwell s.append(volume / tpump * math.log(pend / pstart)) @@ -573,8 +576,8 @@ def vacuum( po.ovarre( self.outfile, "Dwell time between burns (s)", - "(t_between_pulse.)", - t_between_pulse, + "(t_plant_pulse_dwell.)", + t_plant_pulse_dwell, ) po.ovarre( self.outfile, diff --git a/tests/integration/data/large_tokamak_eval.IN.DAT b/tests/integration/data/large_tokamak_eval.IN.DAT index 73cab3979b..60cd97d7ae 100644 --- a/tests/integration/data/large_tokamak_eval.IN.DAT +++ b/tests/integration/data/large_tokamak_eval.IN.DAT @@ -393,7 +393,7 @@ nflutfmax = 1e22 * max fluence in the TF coil *-----------------Times Variables------------------* pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); -t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) +t_plant_pulse_dwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index c084f00638..755095a640 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -439,7 +439,7 @@ i_ind_plasma_internal_norm = 1 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 diff --git a/tests/regression/input_files/large_tokamak_eval.IN.DAT b/tests/regression/input_files/large_tokamak_eval.IN.DAT index 2aec434934..e442cf3567 100644 --- a/tests/regression/input_files/large_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/large_tokamak_eval.IN.DAT @@ -396,7 +396,7 @@ nflutfmax = 1e22 * max fluence in the TF coil *-----------------Times Variables------------------* pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); -t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) +t_plant_pulse_dwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index ac4a3249a4..2225ef9803 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -415,7 +415,7 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 diff --git a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT index 905a1a46d7..9072984433 100644 --- a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT @@ -379,7 +379,7 @@ f_vforce_inboard = 0.5 * Fraction of the total vertical force taken by the TF in *-----------------Times Variables------------------* t_plant_pulse_burn = 1000.0 * flat-top duration (s) (calculated if `i_pulsed_plant=1`) -t_between_pulse = 100.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) +t_plant_pulse_dwell = 100.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) *--------------------Utilities---------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 05e137d289..e1b581b887 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3095,9 +3095,9 @@ lsa = 2 *i_vac_pump_dwell = * DESCRIPTION: Switch for dwell pumping options: -* =0 pumping only during t_between_pulse +* =0 pumping only during t_plant_pulse_dwell * =1 pumping only during t_plant_pulse_coil_precharge -* =2 pumping during t_between_pulse + t_plant_pulse_coil_precharge +* =2 pumping during t_plant_pulse_dwell + t_plant_pulse_coil_precharge * JUSTIFICATION: Not yet set. *pumpareafraction = @@ -3161,7 +3161,7 @@ t_plant_pulse_burn = 1000.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -t_between_pulse = 100.0 +t_plant_pulse_dwell = 100.0 * DESCRIPTION: Time Between Pulses in a Pulsed Reactor (s) * JUSTIFICATION: Steady-state device, assumed diff --git a/tests/unit/test_vacuum.py b/tests/unit/test_vacuum.py index 9024de204c..7479f5cafd 100644 --- a/tests/unit/test_vacuum.py +++ b/tests/unit/test_vacuum.py @@ -34,7 +34,7 @@ def test_simple_model(self, monkeypatch, vacuum): ) monkeypatch.setattr(pv, "a_plasma_surface", 1500.3146527709359) monkeypatch.setattr(tfv, "n_tf_coils", 18) - monkeypatch.setattr(tv, "t_between_pulse", 500) + monkeypatch.setattr(tv, "t_plant_pulse_dwell", 500) monkeypatch.setattr(vacv, "outgasfactor", 0.0235) monkeypatch.setattr(vacv, "outgasindex", 1) monkeypatch.setattr(vacv, "pres_vv_chamber_base", 0.0005) @@ -74,7 +74,7 @@ def test_old_model(self, monkeypatch, vacuum): thtf = 0.63812000000000002 ritf = 3.6371848450794664 n_tf_coils = 18 - t_between_pulse = 1800 + t_plant_pulse_dwell = 1800 nplasma = 7.2834e19 qtorus = 0 gasld = 2.7947500651998464e-05 @@ -96,7 +96,7 @@ def test_old_model(self, monkeypatch, vacuum): thtf, ritf, n_tf_coils, - t_between_pulse, + t_plant_pulse_dwell, nplasma, ndiv, qtorus, From e593b497a0aa3bdc105468aa51f840185cafecb0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 21 Oct 2025 11:02:34 +0100 Subject: [PATCH 11/13] Refactor variable names for consistency across multiple files - Changed instances of 't_plant_pulse_dwellwell' to 't_plant_pulse_dwell' in various data files to standardize naming conventions. - Updated related comments and variable assignments to reflect the new naming. - Ensured consistency in the use of 't_plant_pulse_coil_precharge' across relevant files. --- .../data/csv_output_large_tokamak_MFILE.DAT | 12 +- examples/data/large_tokamak_1_MFILE.DAT | 12 +- examples/data/large_tokamak_2_MFILE.DAT | 12 +- examples/data/large_tokamak_3_MFILE.DAT | 12 +- examples/data/large_tokamak_4_MFILE.DAT | 12 +- examples/data/large_tokamak_IN.DAT | 4 +- examples/data/large_tokamak_eval_IN.DAT | 4 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 12 +- examples/data/large_tokamak_nof_MFILE.DAT | 12 +- examples/data/scan_MFILE.DAT | 76 +++++------ examples/data/scan_example_file_IN.DAT | 4 +- .../data/large_tokamak_1_MFILE.DAT | 12 +- .../data/large_tokamak_2_MFILE.DAT | 12 +- .../data/large_tokamak_3_MFILE.DAT | 12 +- .../data/large_tokamak_4_MFILE.DAT | 12 +- tests/integration/data/large_tokamak_IN.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 12 +- tests/integration/data/ref_IN.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 124 +++++++++--------- tests/integration/data/scan_MFILE.DAT | 76 +++++------ tests/unit/data/large_tokamak_IN.DAT | 4 +- tests/unit/data/large_tokamak_MFILE.DAT | 12 +- 22 files changed, 228 insertions(+), 228 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index e9691792a4..6507abdbce 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -557,12 +557,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8401E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.8571E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6699E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.1999E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6699E+02 - Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8441E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -1048,8 +1048,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6766E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6766E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6929E+01 OP @@ -1631,13 +1631,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_plant_pulse_dwellwell = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 1c375adcde..4f86b2faa3 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,8 +1043,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1625,13 +1625,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_plant_pulse_dwellwell = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 3198cf545e..c179e6c9aa 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,8 +1043,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1625,13 +1625,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_plant_pulse_dwellwell = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 8f43b1f4ea..60d2ba7378 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,8 +1043,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1626,13 +1626,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_plant_pulse_dwellwell = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 96303a6ec8..1195f41027 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_prechargese_coil_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwellwell)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,8 +1043,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwellwell.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1626,13 +1626,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_plant_pulse_dwellwell = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index da0321498c..2d29ef61b9 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -431,13 +431,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/large_tokamak_eval_IN.DAT b/examples/data/large_tokamak_eval_IN.DAT index b81cc594c6..0e1e9937e3 100644 --- a/examples/data/large_tokamak_eval_IN.DAT +++ b/examples/data/large_tokamak_eval_IN.DAT @@ -392,8 +392,8 @@ f_a_tf_turn_cable_space_extra_void = 0.3 * coolant fraction of TFC 'cable' ( *-----------------Times Variables------------------* pulsetimings = 0 * Switch for pulse timings (if i_pulsed_plant=1); -t_plant_pulse_dwellwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up +t_plant_pulse_dwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) +t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index e27689c753..f5e6d464f6 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -450,12 +450,12 @@ Required_volt-seconds_during_start-up_(Wb)_______________________________ (vssoft)_______________________ 2.97897067240026217e+02 Available_volt-seconds_during_burn_(Wb)__________________________________ (vsmax)________________________ 2.62897202405171981e+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_prechargese_coil_precharge)__________________ 5.00000000000000000e+02 + Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.60910954080422698e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.60910954080422698e+02 - Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwellwell)______________ 1.80000000000000000e+03 + Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwell)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 8.76211449542915943e+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -999,8 +999,8 @@ Chamber_pressure_after_burn_(Pa)_________________________________________ (pend)_________________________ 1.61381834730617624e-01 OP Chamber_pressure_before_burn_(Pa)________________________________________ (pstart)_______________________ 1.61381834730617638e-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)_____________________________________________ (t_plant_pulse_dwellwell.)_____________ 1.80000000000000000e+03 - CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)_________________ 5.00000000000000000e+02 + Dwell_time_between_burns_(s)_____________________________________________ (t_plant_pulse_dwell.)_____________ 1.80000000000000000e+03 + CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_precharge.)_________________ 5.00000000000000000e+02 Allowable_pumping_time_between_burns_(s)_________________________________ (tpump)________________________ 1.80000000000000000e+03 Required_D-T_pump_speed_(m3/s)___________________________________________ (s(2))_________________________ 5.77897305930929406e+00 OP D-T_pump_speed_provided_(m3/s)___________________________________________ (snet(2))______________________ 8.05842119672848440e+01 OP @@ -1572,8 +1572,8 @@ f_a_tf_turn_cable_space_extra_void = 0.3 * coolant fraction of TFC 'cable' ( *-----------------Times Variables------------------* pulsetimings = 0 * Switch for pulse timings (if lpulse=1); -t_plant_pulse_dwellwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up +t_plant_pulse_dwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) +t_plant_pulse_coil_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_plant_pulse_plasma_current_ramp_up *--------------------Utilities---------------------* diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index 30211b3d14..c02e4b4ef5 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -524,12 +524,12 @@ Required_volt-seconds_during_start-up_(Wb)_______________________________ (vssoft)_______________________ 3.10133419793858025e+02 Available_volt-seconds_during_burn_(Wb)__________________________________ (vsmax)________________________ 2.83743882145049042e+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_prechargese_coil_precharge)__________________ 5.00000000000000000e+02 + Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.75262350092394996e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.75262350092394996e+02 - Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwellwell)______________ 1.80000000000000000e+03 + Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwell)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 1.00054568371814421e+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -1073,8 +1073,8 @@ Chamber_pressure_after_burn_(Pa)_________________________________________ (pend)_________________________ 1.75966345086182835e-01 OP Chamber_pressure_before_burn_(Pa)________________________________________ (pstart)_______________________ 1.75966345086182841e-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)_____________________________________________ (t_plant_pulse_dwellwell.)_____________ 1.80000000000000000e+03 - CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_prechargese_coil_precharge.)_________________ 5.00000000000000000e+02 + Dwell_time_between_burns_(s)_____________________________________________ (t_plant_pulse_dwell.)_____________ 1.80000000000000000e+03 + CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_precharge.)_________________ 5.00000000000000000e+02 Allowable_pumping_time_between_burns_(s)_________________________________ (tpump)________________________ 1.80000000000000000e+03 Required_D-T_pump_speed_(m3/s)___________________________________________ (s(2))_________________________ 5.77897305930929495e+00 OP D-T_pump_speed_provided_(m3/s)___________________________________________ (snet(2))______________________ 4.85613085971767617e+01 OP @@ -1635,13 +1635,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_plant_pulse_dwellwell = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_plant_pulse_coil_prechargese_coil_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 4992961212..1121dc0a87 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -410,12 +410,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -872,8 +872,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -1405,12 +1405,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -1867,8 +1867,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -2400,12 +2400,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -2862,8 +2862,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -3395,12 +3395,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -3857,8 +3857,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -4390,12 +4390,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -4852,8 +4852,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -5385,12 +5385,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -5847,8 +5847,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -6380,12 +6380,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -6842,8 +6842,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -7375,12 +7375,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -7837,8 +7837,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -8370,12 +8370,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -8832,8 +8832,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -9270,9 +9270,9 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor *-----------------Pulse Variables------------------* i_pulsed_plant = 1 * Switch for reactor model; -t_between_pulse = 0 * dwell time (s) +t_plant_pulse_dwell = 0 * dwell time (s) pulsetimings = 0 -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 *-----------------Tfcoil Variables-----------------* diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index e05c9f7a39..22a5619984 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -431,13 +431,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e50a5b7e96..9c412a0f35 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -554,12 +554,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1042,8 +1042,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1624,13 +1624,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index e675965e78..081492d23a 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,8 +1043,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1625,13 +1625,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 7ff496e209..3fd028968a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,8 +1043,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1625,13 +1625,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d4752f7482..c7cb2b2301 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1043,8 +1043,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.6700E+01 OP @@ -1625,13 +1625,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 809c7f7a32..5f655ebb7e 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -430,13 +430,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 092bb0ba4a..151c79ae55 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -708,12 +708,12 @@ Inductive_fraction_______________________________________________________ (f_c_plasma_inductive)_________ 5.49633213668178855e-01 OP Fraction_of_the_plasma_current_produced_by_non-inductive_means___________ (f_c_plasma_non_inductive)_____ 4.50366786331821145e-01 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_precharge)__________________ 5.00000000000000000e+02 + Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.65098157448736771e+02 Heating_time_(s)_________________________________________________________ (t_fusion_ramp)________________ 1.00000000000000000e+01 Burn_time_(s)____________________________________________________________ (t_burn)_______________________ 7.20027233571826036e+03 OP Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.65098157448736771e+02 - Time_between_pulses_(s)__________________________________________________ (t_between_pulse)______________ 1.80000000000000000e+03 + Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwell)______________ 1.80000000000000000e+03 Total_plant_cycle_time_(s)_______________________________________________ (t_cycle)______________________ 9.84046865061573772e+03 OP Flux_expansion___________________________________________________________ (f_div_flux_expansion)_________ 2.00000000000000000e+00 Field_line_angle_wrt_to_target_divertor_plate_(degrees)__________________ (deg_div_field_plate)__________ 1.00000000000000000e+00 @@ -1293,8 +1293,8 @@ Chamber_pressure_after_burn_(Pa)_________________________________________ (pend)_________________________ 1.65761323650627984e-01 OP Chamber_pressure_before_burn_(Pa)________________________________________ (pstart)_______________________ 1.65761323650627989e-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)_____________________________________________ (t_between_pulse.)_____________ 1.80000000000000000e+03 - CS_ramp-up_time_burns_(s)________________________________________________ (t_precharge.)_________________ 5.00000000000000000e+02 + Dwell_time_between_burns_(s)_____________________________________________ (t_plant_pulse_dwell.)_____________ 1.80000000000000000e+03 + CS_ramp-up_time_burns_(s)________________________________________________ (t_plant_pulse_coil_precharge.)_________________ 5.00000000000000000e+02 Allowable_pumping_time_between_burns_(s)_________________________________ (tpump)________________________ 1.80000000000000000e+03 Required_D-T_pump_speed_(m3/s)___________________________________________ (s(2))_________________________ 5.77897305930929495e+00 OP D-T_pump_speed_provided_(m3/s)___________________________________________ (snet(2))______________________ 6.00584768236042237e+01 OP @@ -1854,13 +1854,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index e1c00dd033..0048df9d53 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -291,9 +291,9 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor *-----------------Pulse Variables------------------* i_pulsed_plant = 1 * Switch for reactor model; -t_between_pulse = 0 * dwell time (s) +t_plant_pulse_dwell = 0 * dwell time (s) pulsetimings = 0 -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 *-----------------Tfcoil Variables-----------------* diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index c7d9d3b0cc..05703d9b13 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -556,12 +556,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8403E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9617E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6569E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6569E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8415E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1044,8 +1044,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6636E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6636E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.4806E+01 OP @@ -1719,12 +1719,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8362E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0338E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6633E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.4937E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6633E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0137E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -2207,8 +2207,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6700E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6700E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5734E+01 OP @@ -2882,12 +2882,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8300E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0929E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6683E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6787E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6683E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0323E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -3370,8 +3370,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6750E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6750E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5987E+01 OP @@ -4045,12 +4045,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8204E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0982E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6609E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7431E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6609E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0386E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -4533,8 +4533,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6676E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6676E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5523E+01 OP @@ -5208,12 +5208,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8323E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0430E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6604E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5979E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6604E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0240E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -5696,8 +5696,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6671E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6671E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5947E+01 OP @@ -6371,12 +6371,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8374E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9690E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6548E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.4808E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6548E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0122E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -6859,8 +6859,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6614E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6614E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.6324E+01 OP @@ -7534,12 +7534,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8284E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9732E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6479E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5384E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6479E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0178E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -8022,8 +8022,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6546E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6546E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5904E+01 OP @@ -8697,12 +8697,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8182E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0426E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6497E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6518E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6497E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0292E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -9185,8 +9185,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6563E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6563E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5984E+01 OP @@ -9860,12 +9860,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8018E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1131E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6468E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7587E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6468E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0398E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -10348,8 +10348,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6534E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6534E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5778E+01 OP @@ -11023,12 +11023,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.7989E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1157E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6447E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7976E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6447E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0437E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -11511,8 +11511,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6513E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6513E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5487E+01 OP @@ -12186,12 +12186,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8184E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0431E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6498E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6748E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6498E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0315E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -12674,8 +12674,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6564E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6564E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5760E+01 OP @@ -13349,12 +13349,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8291E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9741E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6485E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5501E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6485E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0190E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -13837,8 +13837,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6551E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6551E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5859E+01 OP @@ -14512,12 +14512,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8251E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9768E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6455E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5927E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6455E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0232E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -15000,8 +15000,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6521E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6521E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5541E+01 OP @@ -15675,12 +15675,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8208E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0430E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6516E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6632E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6516E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0304E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -16163,8 +16163,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6583E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6583E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5579E+01 OP @@ -16838,12 +16838,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8166E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1092E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6581E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7318E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6581E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0374E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -17326,8 +17326,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6648E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6648E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 6.5622E+01 OP @@ -17912,13 +17912,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 72d0a7c2bc..587e3b02d5 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -410,12 +410,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -872,8 +872,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -1405,12 +1405,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -1867,8 +1867,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -2400,12 +2400,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -2862,8 +2862,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -3395,12 +3395,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -3857,8 +3857,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -4390,12 +4390,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -4852,8 +4852,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -5385,12 +5385,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -5847,8 +5847,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -6380,12 +6380,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -6842,8 +6842,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -7375,12 +7375,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -7837,8 +7837,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -8370,12 +8370,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -8832,8 +8832,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 0.0000E+00 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 5.0000E+02 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 2.8467E+01 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 8.9545E+01 OP @@ -9270,9 +9270,9 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor *-----------------Pulse Variables------------------* i_pulsed_plant = 1 * Switch for reactor model; -t_between_pulse = 0 * dwell time (s) +t_plant_pulse_dwell = 0 * dwell time (s) pulsetimings = 0 -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 *-----------------Tfcoil Variables-----------------* diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index a706920fb2..15b9e2a2ad 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -431,13 +431,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index feed9dcc27..0b5798d20b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -552,12 +552,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8516E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.6494E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_precharge)_______________________ 5.0000E+02 + Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6521E+02 Heating_time_(s)________________________________________________________ (t_fusion_ramp)_______________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.1971E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6521E+02 - Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 + Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8377E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1046,8 +1046,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6587E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6587E-03 Allowable_pumping_time_switch___________________________________________ (i_vac_pump_dwell)__________________ 0 - Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03 - CS_ramp-up_time_burns_(s)_______________________________________________ (t_precharge.)______________________ 5.0000E+02 + Dwell_time_between_burns_(s)____________________________________________ (t_plant_pulse_dwell.)_____________________ 1.8000E+03 + CS_ramp-up_time_burns_(s)_______________________________________________ (t_plant_pulse_coil_precharge.)______________________ 5.0000E+02 Allowable_pumping_time_between_burns_(s)________________________________ (tpump)_______________________ 1.8000E+03 Required_D-T_pump_speed_(m3/s)__________________________________________ (s(2))________________________ 5.7790E+00 OP D-T_pump_speed_provided_(m3/s)__________________________________________ (snet(2))_____________________ 5.7143E+01 OP @@ -1627,13 +1627,13 @@ plasma_res_factor = 0.7 i_pulsed_plant = 1 * dwell time [s] -t_between_pulse = 1800.0 +t_plant_pulse_dwell = 1800.0 * Switch for pulse timing calculations pulsetimings = 0 * CS ramp up time [s] -t_precharge = 500.0 +t_plant_pulse_coil_precharge = 500.0 * Current drive * *---------------* From 1fb18405a11a009b976e1f6592cda654cb105f6b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 21 Oct 2025 16:19:57 +0100 Subject: [PATCH 12/13] Refactor time variable names in MFILE data for consistency --- .../data/csv_output_large_tokamak_MFILE.DAT | 6 +- examples/data/large_tokamak_1_MFILE.DAT | 6 +- examples/data/large_tokamak_2_MFILE.DAT | 6 +- examples/data/large_tokamak_3_MFILE.DAT | 6 +- examples/data/large_tokamak_4_MFILE.DAT | 6 +- examples/data/large_tokamak_nof_2_MFILE.DAT | 6 +- examples/data/large_tokamak_nof_MFILE.DAT | 6 +- examples/data/scan_MFILE.DAT | 76 +++++------ .../data/large_tokamak_1_MFILE.DAT | 8 +- .../data/large_tokamak_2_MFILE.DAT | 8 +- .../data/large_tokamak_3_MFILE.DAT | 8 +- .../data/large_tokamak_4_MFILE.DAT | 8 +- .../integration/data/large_tokamak_MFILE.DAT | 10 +- tests/integration/data/ref_IN.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 120 +++++++++--------- tests/integration/data/scan_MFILE.DAT | 76 +++++------ tests/unit/data/large_tokamak_MFILE.DAT | 10 +- 17 files changed, 185 insertions(+), 185 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 6507abdbce..6c3897e735 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -560,10 +560,10 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6699E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.1999E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6699E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.1999E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6699E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8441E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8441E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 4f86b2faa3..48c8d55834 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -558,10 +558,10 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2035E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index c179e6c9aa..cb66441dcf 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -558,10 +558,10 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2035E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 60d2ba7378..1a6e66fdd5 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -558,10 +558,10 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2035E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 1195f41027..83e7c3335d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -558,10 +558,10 @@ Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)_______________________ 1.6631E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2035E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT index f5e6d464f6..0f631d4afb 100644 --- a/examples/data/large_tokamak_nof_2_MFILE.DAT +++ b/examples/data/large_tokamak_nof_2_MFILE.DAT @@ -453,10 +453,10 @@ Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.60910954080422698e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 - Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 6.13029258726831449e+03 OP - Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.60910954080422698e+02 + Burn_time_(s)____________________________________________________________ (t_plant_pulse_burn)_______________________ 6.13029258726831449e+03 OP + Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_down)__________________ 1.60910954080422698e+02 Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwell)______________ 1.80000000000000000e+03 - Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 8.76211449542915943e+03 OP + Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total)______________________ 8.76211449542915943e+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 Inboard_build_thickness_(m)______________________________________________ (dr_inboard_build)_____________ 5.33333333333333393e+00 OP diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT index c02e4b4ef5..fea055aaaf 100644 --- a/examples/data/large_tokamak_nof_MFILE.DAT +++ b/examples/data/large_tokamak_nof_MFILE.DAT @@ -527,10 +527,10 @@ Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_precharge)__________________ 5.00000000000000000e+02 Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.75262350092394996e+02 Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 - Burn_time_(s)____________________________________________________________ (t_plant_pulse_burnt_pulse_burn)_______________________ 7.34493213699665284e+03 OP - Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down)__________________ 1.75262350092394996e+02 + Burn_time_(s)____________________________________________________________ (t_plant_pulse_burn)_______________________ 7.34493213699665284e+03 OP + Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_down)__________________ 1.75262350092394996e+02 Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwell)______________ 1.80000000000000000e+03 - Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total_pulse_total)______________________ 1.00054568371814421e+04 OP + Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total)______________________ 1.00054568371814421e+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 Inboard_build_thickness_(m)______________________________________________ (dr_inboard_build)_____________ 5.33333333333333393e+00 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 1121dc0a87..f1d126eecb 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -411,12 +411,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -1406,12 +1406,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -2401,12 +2401,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -3396,12 +3396,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -4391,12 +4391,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -5386,12 +5386,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -6381,12 +6381,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -7376,12 +7376,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -8371,12 +8371,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -9308,8 +9308,8 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) -t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) b_plasma_toroidal_on_axis = 5.3292E+00 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 9c412a0f35..b1d8c612f5 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -555,12 +555,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2035E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 081492d23a..cae56dfd52 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -556,12 +556,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2035E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 3fd028968a..239cd61b90 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -556,12 +556,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2035E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index c7cb2b2301..28e74b4ad0 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -556,12 +556,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6631E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6631E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2035E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6631E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2035E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6631E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 151c79ae55..03de59b757 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -709,12 +709,12 @@ Fraction_of_the_plasma_current_produced_by_non-inductive_means___________ (f_c_plasma_non_inductive)_____ 4.50366786331821145e-01 # Times # Initial_charge_time_for_CS_from_zero_current_(s)_________________________ (t_plant_pulse_coil_precharge)__________________ 5.00000000000000000e+02 - Plasma_current_ramp-up_time_(s)__________________________________________ (t_current_ramp_up)____________ 1.65098157448736771e+02 - Heating_time_(s)_________________________________________________________ (t_fusion_ramp)________________ 1.00000000000000000e+01 - Burn_time_(s)____________________________________________________________ (t_burn)_______________________ 7.20027233571826036e+03 OP - Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_ramp_down)__________________ 1.65098157448736771e+02 + Plasma_current_ramp-up_time_(s)__________________________________________ (t_plant_pulse_plasma_current_ramp_up)____________ 1.65098157448736771e+02 + Heating_time_(s)_________________________________________________________ (t_plant_pulse_fusion_ramp)________________ 1.00000000000000000e+01 + Burn_time_(s)____________________________________________________________ (t_plant_pulse_burn)_______________________ 7.20027233571826036e+03 OP + Reset_time_to_zero_current_for_CS_(s)____________________________________ (t_plant_pulse_plasma_current_ramp_down)__________________ 1.65098157448736771e+02 Time_between_pulses_(s)__________________________________________________ (t_plant_pulse_dwell)______________ 1.80000000000000000e+03 - Total_plant_cycle_time_(s)_______________________________________________ (t_cycle)______________________ 9.84046865061573772e+03 OP + Total_plant_cycle_time_(s)_______________________________________________ (t_plant_pulse_total)______________________ 9.84046865061573772e+03 OP Flux_expansion___________________________________________________________ (f_div_flux_expansion)_________ 2.00000000000000000e+00 Field_line_angle_wrt_to_target_divertor_plate_(degrees)__________________ (deg_div_field_plate)__________ 1.00000000000000000e+00 Divertor_heat_load_(MW/m2)_______________________________________________ (pflux_div_heat_load_mw)_______ 6.81828125384577000e+00 diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 0048df9d53..d90df00780 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -328,8 +328,8 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) -t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) b_plasma_toroidal_on_axis = 5.3292E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 05703d9b13..b97ad7b12c 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -557,12 +557,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9617E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6569E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6569E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6569E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6569E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8415E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8415E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -1720,12 +1720,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0338E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6633E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6633E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.4937E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6633E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.4937E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6633E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0137E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0137E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -2883,12 +2883,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0929E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6683E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6683E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6787E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6683E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.6787E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6683E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0323E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0323E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -4046,12 +4046,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0982E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6609E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6609E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7431E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6609E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.7431E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6609E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0386E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0386E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -5209,12 +5209,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0430E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6604E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6604E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5979E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6604E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.5979E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6604E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0240E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0240E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -6372,12 +6372,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9690E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6548E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6548E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.4808E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6548E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.4808E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6548E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0122E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0122E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -7535,12 +7535,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9732E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6479E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6479E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5384E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6479E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.5384E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6479E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0178E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0178E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -8698,12 +8698,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0426E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6497E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6497E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6518E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6497E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.6518E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6497E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0292E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0292E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -9861,12 +9861,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1131E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6468E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6468E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7587E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6468E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.7587E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6468E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0398E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0398E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -11024,12 +11024,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1157E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6447E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6447E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7976E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6447E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.7976E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6447E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0437E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0437E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -12187,12 +12187,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0431E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6498E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6498E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6748E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6498E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.6748E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6498E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0315E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0315E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -13350,12 +13350,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9741E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6485E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6485E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5501E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6485E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.5501E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6485E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0190E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0190E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -14513,12 +14513,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9768E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6455E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6455E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5927E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6455E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.5927E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6455E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0232E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0232E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -15676,12 +15676,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0430E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6516E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6516E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6632E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6516E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.6632E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6516E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0304E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0304E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 @@ -16839,12 +16839,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1092E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6581E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6581E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7318E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6581E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.7318E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6581E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0374E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 1.0374E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 587e3b02d5..dc2b4921bf 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -411,12 +411,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -1406,12 +1406,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -2401,12 +2401,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -3396,12 +3396,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -4391,12 +4391,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -5386,12 +5386,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -6381,12 +6381,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -7376,12 +7376,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -8371,12 +8371,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 0.0000E+00 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.2626E+00 ITV @@ -9308,8 +9308,8 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) -t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) +t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) b_plasma_toroidal_on_axis = 5.3292E+00 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 0b5798d20b..8ec2171097 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -553,12 +553,12 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.6494E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_current_ramp_up)________________________ 1.6521E+02 - Heating_time_(s)________________________________________________________ (t_fusion_ramp)_______________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.1971E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6521E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.6521E+02 + Heating_time_(s)________________________________________________________ (t_plant_pulse_fusion_ramp)_______________ 1.0000E+01 + Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.1971E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.6521E+02 Time_between_pulses_(s)_________________________________________________ (t_plant_pulse_dwell)______________________ 1.8000E+03 - Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8377E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_plant_pulse_total)______________________ 9.8377E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 From 78a38b290348c31bf885d869127a3a98090d3189 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 23 Oct 2025 11:16:18 +0100 Subject: [PATCH 13/13] =?UTF-8?q?=F0=9F=94=84=20-=20Refactor=20variable=20?= =?UTF-8?q?name=20`t=5Fplant=5Fpulse=5Fplasma=5Fcurrent=5Framp=5Fupsma=5Fc?= =?UTF-8?q?urrent=5Framp=5Fup`=20to=20`t=5Fplant=5Fpulse=5Fplasma=5Fcurren?= =?UTF-8?q?t=5Framp`=20for=20consistency=20in=20`scan=5FMFILE.DAT`=20and?= =?UTF-8?q?=20`ref=5FIN.DAT`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/data/scan_MFILE.DAT | 19 +++++++++---------- tests/integration/data/ref_IN.DAT | 1 - tests/integration/data/scan_MFILE.DAT | 1 - 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index f1d126eecb..164b2aff5e 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -411,7 +411,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -1406,7 +1406,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -2401,7 +2401,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -3396,7 +3396,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_ups)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -4391,7 +4391,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -5386,7 +5386,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -6381,7 +6381,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -7376,7 +7376,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -8371,7 +8371,7 @@ Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # Initial_charge_time_for_CS_from_zero_current_(s)________________________ (t_plant_pulse_coil_precharge)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_upsma_current_ramp_up)________________________ 1.8078E+02 + Plasma_current_ramp-up_time_(s)_________________________________________ (t_plant_pulse_plasma_current_ramp_up)________________________ 1.8078E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 Burn_time_(s)___________________________________________________________ (t_plant_pulse_burn)_______________________ 7.2000E+03 OP Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_plant_pulse_plasma_current_ramp_down)_______________________ 1.8078E+02 @@ -9308,7 +9308,6 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index d90df00780..01ddeac9c3 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -328,7 +328,6 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index dc2b4921bf..eab9fd4063 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -9308,7 +9308,6 @@ qnuc = 1.292E4 *-----------------Times Variables------------------* -t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) t_plant_pulse_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1)