From 66259a4b5b2c08ab10f14be129a139cab04eddb3 Mon Sep 17 00:00:00 2001 From: Jack Date: Mon, 2 Dec 2024 15:48:10 +0000 Subject: [PATCH] Changed tcycle to t_cycle --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/availability.py | 20 ++++++------- process/costs.py | 2 +- process/physics.py | 6 ++-- source/fortran/constraint_equations.f90 | 6 ++-- source/fortran/stellarator.f90 | 4 +-- source/fortran/times_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_availability.py | 14 ++++----- tests/unit/test_costs_1990.py | 8 ++--- 24 files changed, 80 insertions(+), 80 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 810f6635..8f746e31 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_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)______________________________________________ (tcycle)______________________ 9.8441E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8441E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 54669fb3..ffcb8049 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_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)______________________________________________ (tcycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 58ceba01..8826c879 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_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)______________________________________________ (tcycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index a1762e70..0dd4583e 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_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)______________________________________________ (tcycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 2224b4a4..0027d226 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_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)______________________________________________ (tcycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 2cd28383..4c81e395 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -416,7 +416,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -1411,7 +1411,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -2406,7 +2406,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -3401,7 +3401,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -4396,7 +4396,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -5391,7 +5391,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -6386,7 +6386,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -7381,7 +7381,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -8376,7 +8376,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV diff --git a/process/availability.py b/process/availability.py index a3807a3f..2a4b3d29 100644 --- a/process/availability.py +++ b/process/availability.py @@ -126,7 +126,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.tcycle / YEAR_SECONDS + pulse_fpy = tv.t_cycle / YEAR_SECONDS cv.bktcycles = (fwbsv.bktlife / pulse_fpy) + 1 # if iavail = 0 use input value for cfactr @@ -166,7 +166,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.tcycle) + cv.cpfact = cv.cfactr * (tv.t_burn / tv.t_cycle) # Modify lifetimes to take account of the availability if ifev.ife != 1: @@ -373,7 +373,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.tcycle) + cv.cpfact = cv.cfactr * (tv.t_burn / tv.t_cycle) # Output if output: @@ -661,11 +661,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.tcycle + n = cv.divlife * YEAR_SECONDS / tv.t_cycle # The probability of failure in one pulse cycle (before the reference cycle life) - pf = (cv.div_prob_fail / DAY_SECONDS) * tv.tcycle - a0 = 1.0e0 - pf * cv.div_umain_time * YEAR_SECONDS / tv.tcycle + pf = (cv.div_prob_fail / DAY_SECONDS) * tv.t_cycle + a0 = 1.0e0 - pf * cv.div_umain_time * YEAR_SECONDS / tv.t_cycle # Integrating the instantaneous availability gives the mean # availability over the planned cycle life N @@ -757,12 +757,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.bktlife * YEAR_SECONDS / tv.tcycle + n = fwbsv.bktlife * YEAR_SECONDS / tv.t_cycle # The probability of failure in one pulse cycle # (before the reference cycle life) - pf = (cv.fwbs_prob_fail / DAY_SECONDS) * tv.tcycle - a0 = 1.0e0 - pf * cv.fwbs_umain_time * YEAR_SECONDS / tv.tcycle + pf = (cv.fwbs_prob_fail / DAY_SECONDS) * tv.t_cycle + a0 = 1.0e0 - pf * cv.fwbs_umain_time * YEAR_SECONDS / tv.t_cycle if cv.fwbs_nu <= cv.fwbs_nref: logger.error( @@ -1072,7 +1072,7 @@ def avail_st(self, output: bool): ) # Capacity factor - cv.cpfact = cv.cfactr * (tv.t_burn / tv.tcycle) + cv.cpfact = cv.cfactr * (tv.t_burn / tv.t_cycle) if output: if tfv.i_tf_sup == 1: diff --git a/process/costs.py b/process/costs.py index cc57ab91..f7beb029 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2591,7 +2591,7 @@ def coelc(self): * (24.0e0 * constants.n_day_year) * cost_variables.cfactr * times_variables.t_burn - / times_variables.tcycle + / times_variables.t_cycle ) # Costs due to reactor plant diff --git a/process/physics.py b/process/physics.py index 3caea8a3..6402c945 100644 --- a/process/physics.py +++ b/process/physics.py @@ -1609,7 +1609,7 @@ def physics(self): ) # Total cycle time - times_variables.tcycle = ( + times_variables.t_cycle = ( times_variables.t_precharge + times_variables.t_current_ramp_up + times_variables.t_fusion_ramp @@ -3143,8 +3143,8 @@ def outtim(self): po.ovarre( self.outfile, "Total plant cycle time (s)", - "(tcycle)", - times_variables.tcycle, + "(t_cycle)", + times_variables.t_cycle, "OP ", ) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 472657ef..6fe641f5 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1851,10 +1851,10 @@ subroutine constraint_eqn_042(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! ftcycl : input real : f-value for cycle time - !! tcycle : input real : full cycle time (s) + !! t_cycle : input real : full cycle time (s) !! tcycmn : input real : minimum cycle time (s) use constraint_variables, only: ftcycl, tcycmn - use times_variables, only: tcycle + use times_variables, only: t_cycle implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1864,7 +1864,7 @@ subroutine constraint_eqn_042(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! if the minimum cycle time == 0 report an error if (tcycmn < 1.0D0) call report_error(6) - tmp_cc = 1.0D0 - ftcycl * tcycle/tcycmn + tmp_cc = 1.0D0 - ftcycl * t_cycle/tcycmn tmp_con = tcycmn * (1.0D0 - tmp_cc) tmp_err = tcycmn * tmp_cc tmp_symbol = '>' diff --git a/source/fortran/stellarator.f90 b/source/fortran/stellarator.f90 index bb6ee671..191bd10f 100644 --- a/source/fortran/stellarator.f90 +++ b/source/fortran/stellarator.f90 @@ -59,7 +59,7 @@ subroutine stinit use numerics, only: boundl, boundu use stellarator_variables, only: istell use tfcoil_variables, only: n_tf - use times_variables, only: t_burn, tcycle, tdown, t_between_pulse, t_fusion_ramp, t_current_ramp_up, & + use times_variables, only: t_burn, t_cycle, tdown, t_between_pulse, t_fusion_ramp, t_current_ramp_up, & t_pulse_repetition, t_ramp_down, t_precharge use global_variables, only: icase use constants, only: pi, rmu0, nout @@ -115,7 +115,7 @@ subroutine stinit t_ramp_down = 0.0D0 t_pulse_repetition = t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down tdown = t_precharge + t_current_ramp_up + t_ramp_down + t_between_pulse - tcycle = t_precharge + t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down + t_between_pulse + t_cycle = t_precharge + t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down + t_between_pulse end subroutine stinit end module stellarator_module diff --git a/source/fortran/times_variables.f90 b/source/fortran/times_variables.f90 index 18e2e4e4..6b619720 100644 --- a/source/fortran/times_variables.f90 +++ b/source/fortran/times_variables.f90 @@ -26,7 +26,7 @@ module times_variables real(dp) :: t_burn_0 !! burn time (s) - used for internal consistency - real(dp) :: tcycle + real(dp) :: t_cycle !! full cycle time (s) real(dp) :: tdown @@ -76,7 +76,7 @@ subroutine init_times_variables pulsetimings = 1.0D0 t_burn = 1000.0D0 t_burn_0 = 0.0D0 - tcycle = 0.0D0 + t_cycle = 0.0D0 tdown = 0.0D0 t_between_pulse = 1800.0D0 t_fusion_ramp = 10.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index c4cc6e45..1998bcf6 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -560,7 +560,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index df428d72..0538ce5e 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -561,7 +561,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 0ca5c40b..244df16c 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -561,7 +561,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 9dc1977a..acc02c59 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -561,7 +561,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8463E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 6ed6a6f6..19507b7c 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -558,7 +558,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8377E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8377E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 4e06e63e..e184b606 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -562,7 +562,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8415E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8415E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -1725,7 +1725,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0137E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0137E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -2888,7 +2888,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0323E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0323E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -4051,7 +4051,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0386E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0386E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -5214,7 +5214,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0240E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0240E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -6377,7 +6377,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0122E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0122E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -7540,7 +7540,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0178E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0178E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -8703,7 +8703,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0292E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0292E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -9866,7 +9866,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0398E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0398E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -11029,7 +11029,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0437E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0437E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -12192,7 +12192,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0315E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0315E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -13355,7 +13355,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0190E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0190E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -14518,7 +14518,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0232E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0232E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -15681,7 +15681,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0304E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0304E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -16844,7 +16844,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0374E+04 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0374E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 7f1f0f03..d8a49e34 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -416,7 +416,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -1411,7 +1411,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -2406,7 +2406,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -3401,7 +3401,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -4396,7 +4396,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -5391,7 +5391,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -6386,7 +6386,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -7381,7 +7381,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV @@ -8376,7 +8376,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index fefd1652..fe98c294 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7500,7 +7500,7 @@ "tcpav2": 0.0, "tcpmax": 0.0, "tcritsc": 16.0, - "tcycle": 0.0, + "t_cycle": 0.0, "tcycmn": 0.0, "tdiv": 2.0, "tdivrepl": 0.25, @@ -10758,7 +10758,7 @@ "tcpav2": "Computed centrepost average temperature (K) (for consistency)", "tcpmax": "peak centrepost temperature (K)", "tcritsc": "critical temperature (K) for superconductor at zero field and strain (`i_tf_sc_mat=4, =tc0m`)", - "tcycle": "full cycle time (s)", + "t_cycle": "full cycle time (s)", "tcycmn": "minimum cycle time (s) (`constraint equation 42`)", "tdiv": "temperature at divertor (eV) (input for stellarator only, calculated for tokamaks)", "tdivrepl": "time taken to replace divertor (y) (`iavail=1`)", @@ -19739,7 +19739,7 @@ "pulsetimings", "t_burn", "t_burn_0", - "tcycle", + "t_cycle", "tdown", "t_between_pulse", "t_fusion_ramp", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 3a9f441b..336f4598 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3288,7 +3288,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: tcycle (s) calculated in-situ +* VARIABLES: t_cycle (s) calculated in-situ *tcycmn = * DESCRIPTION: Minimum full pulse cycle time (s) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 7a2b2f37..ba3ebf04 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -558,7 +558,7 @@ 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 - Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8377E+03 OP + Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8377E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 diff --git a/tests/unit/test_availability.py b/tests/unit/test_availability.py index 98b1daed..1849ce12 100644 --- a/tests/unit/test_availability.py +++ b/tests/unit/test_availability.py @@ -48,7 +48,7 @@ def test_avail_0(monkeypatch, availability, fwlife, ibkt_life, bktlife_exp_param monkeypatch.setattr(cv, "life_dpa", 40.0) monkeypatch.setattr(cv, "adivflnc", 8.0) monkeypatch.setattr(dv, "hldiv", 10.0) - monkeypatch.setattr(tv, "tcycle", 5.0) + 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) @@ -336,7 +336,7 @@ def calc_u_unplanned_divertor_param(**kwargs): :rtype: dict """ # Default parameters - defaults = {"divlife": 1.99, "tcycle": 9000, "expected": approx(0.02, abs=0.005)} + defaults = {"divlife": 1.99, "t_cycle": 9000, "expected": approx(0.02, abs=0.005)} # Merge default dict with any optional keyword arguments to override values param = {**defaults, **kwargs} @@ -380,7 +380,7 @@ def calc_u_unplanned_divertor_fix(request, monkeypatch): # Mock variables used by calc_u_unplanned_divertor() # Some may be parameterised - monkeypatch.setattr(fortran.times_variables, "tcycle", param["tcycle"]) + monkeypatch.setattr(fortran.times_variables, "t_cycle", param["t_cycle"]) monkeypatch.setattr(cv, "divlife", param["divlife"]) # Return the expected result for the given parameter list @@ -411,7 +411,7 @@ def calc_u_unplanned_fwbs_param(**kwargs): :rtype: dict """ # Default parameters - defaults = {"bktlife": 5, "tcycle": 9000, "expected": approx(0.02, abs=0.005)} + defaults = {"bktlife": 5, "t_cycle": 9000, "expected": approx(0.02, abs=0.005)} # Merge default dict with any optional keyword arguments to override values param = {**defaults, **kwargs} @@ -454,7 +454,7 @@ def calc_u_unplanned_fwbs_fix(request, monkeypatch): # Mock variables used by calc_u_unplanned_fwbs() # Some may be parameterised - monkeypatch.setattr(fortran.times_variables, "tcycle", param["tcycle"]) + monkeypatch.setattr(fortran.times_variables, "t_cycle", param["t_cycle"]) monkeypatch.setattr(fortran.fwbs_variables, "bktlife", param["bktlife"]) # Return the expected result for the given parameter list @@ -527,7 +527,7 @@ def mock_calc_u_unplanned_vacuum(*args, **kwargs): # Mock module variables monkeypatch.setattr(tv, "t_burn", 5.0) - monkeypatch.setattr(tv, "tcycle", 50.0) + monkeypatch.setattr(tv, "t_cycle", 50.0) monkeypatch.setattr(ifev, "ife", 0) monkeypatch.setattr(pv, "itart", 1) monkeypatch.setattr(fwbsv, "bktlife", 5.0) @@ -573,7 +573,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_burn", 5.0) - monkeypatch.setattr(tv, "tcycle", 10.0) + monkeypatch.setattr(tv, "t_cycle", 10.0) availability.avail_st(output=False) diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index dc540e2c..5a0698d6 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -5490,7 +5490,7 @@ class CoelcParam(NamedTuple): f_helium3: Any = None - tcycle: Any = None + t_cycle: Any = None t_burn: Any = None @@ -5586,7 +5586,7 @@ class CoelcParam(NamedTuple): itart=0, wtgpd=507.88376577416528, f_helium3=0, - tcycle=10864.426139387357, + t_cycle=10864.426139387357, t_burn=0, outfile=11, expected_coeoam=4.4099029328740929e20, @@ -5670,7 +5670,7 @@ class CoelcParam(NamedTuple): itart=0, wtgpd=507.72524666099866, f_helium3=0, - tcycle=864.42613938735622, + t_cycle=864.42613938735622, t_burn=10230.533336387549, outfile=11, expected_coeoam=1.2419424614419636, @@ -5785,7 +5785,7 @@ def test_coelc(coelcparam, monkeypatch, costs): monkeypatch.setattr(physics_variables, "f_helium3", coelcparam.f_helium3) - monkeypatch.setattr(times_variables, "tcycle", coelcparam.tcycle) + monkeypatch.setattr(times_variables, "t_cycle", coelcparam.t_cycle) monkeypatch.setattr(times_variables, "t_burn", coelcparam.t_burn)