diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md
index 8bf549a4..c5b9bafa 100644
--- a/documentation/proc-pages/eng-models/central-solenoid.md
+++ b/documentation/proc-pages/eng-models/central-solenoid.md
@@ -93,7 +93,7 @@ An example output follows. Note that in this example the cycle life is *not* su
```text
Residual hoop stress in CS Steel (Pa) (residual_sig_hoop) 2.400E+08
- Minimum burn time (s) (tbrnmn) 7.200E+03
+ Minimum burn time (s) (t_burn_min) 7.200E+03
Initial vertical crack size (m) (t_crack_vertical) 8.900E-04
Initial radial crack size (m) (t_crack_radial) 2.670E-03
CS turn area (m) (a_oh_turn) 1.904E-03
@@ -150,15 +150,7 @@ The absolute value of the central solenoid current density at the end-of-flat-to
is specified by the user, and can be used as an iteration variable (no. 37). The current density at
the beginning-of-pulse ('BOP' - See Figure 1) is specified as a (positive) fraction of `coheof`
using `fcohbop` (iteration variable no. 41). The current density in the CS at all other times is
-calculated by taking into account the flux swing necessary to initiate and maintain plasma current.
-
-
+calculated by taking into account the flux swing necessary to initiate and maintain plasma current.
The current density in the central solenoid can be limited at BOP and at EOF. To limit the current
density at BOP, constraint equation no. 27 is used with iteration variable no. 39 (`fjohc0`). To
@@ -177,3 +169,6 @@ constraints (26 and 27) are activated.
!!! tip "Recommended maximum current ratio"
For engineering feasibility, the centrepost currents at end of flat-top and beginning of pulse (`fjohc` and `fjohc0` respectively) shouldn't be set above 0.7.
+
+!!! note "Central solenoid current over time"
+ A plot of how the central solenoid current varies over time can be found [here](../physics-models/pulsed-plant.md#burn-time)
diff --git a/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md b/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md
index e4329a83..b60d307f 100644
--- a/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md
+++ b/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md
@@ -115,6 +115,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 `tpulse`), and other 'cold' components.
+the total PF coil stored energy to the fusion power pulse time `t_pulse_repetition`), 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/documentation/proc-pages/images/current_vs_time.png b/documentation/proc-pages/images/current_vs_time.png
index 9d914072..d276ccde 100644
Binary files a/documentation/proc-pages/images/current_vs_time.png and b/documentation/proc-pages/images/current_vs_time.png differ
diff --git a/documentation/proc-pages/io/utilities.md b/documentation/proc-pages/io/utilities.md
index 5d59d9d4..62a4c72c 100644
--- a/documentation/proc-pages/io/utilities.md
+++ b/documentation/proc-pages/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 `tburn` in hrs.
+used for startup and total available in $\text{Wb}$. Total burn time `t_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/proc-pages/physics-models/current_vs_time.png b/documentation/proc-pages/physics-models/current_vs_time.png
new file mode 100644
index 00000000..d276ccde
Binary files /dev/null and b/documentation/proc-pages/physics-models/current_vs_time.png differ
diff --git a/documentation/proc-pages/physics-models/plasma_current/plasma_current.md b/documentation/proc-pages/physics-models/plasma_current/plasma_current.md
index 957e954a..57f22dfe 100644
--- a/documentation/proc-pages/physics-models/plasma_current/plasma_current.md
+++ b/documentation/proc-pages/physics-models/plasma_current/plasma_current.md
@@ -669,11 +669,11 @@ $$
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 `ftohs` can be varied also
+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 `tohs` is dictated by the [pulsed plant operation configuration](../pulsed-plant.md).
+The calculated plasma current ramp up time `t_current_ramp_up` is dictated by the [pulsed plant operation configuration](../pulsed-plant.md).
-This constraint will ensure that the value of `tohs` is always greater than or equal to `tohsm`
+This constraint will ensure that the value of `t_current_ramp_up` is always greater than or equal to `tohsm`
--------------------
diff --git a/documentation/proc-pages/physics-models/pulsed-plant.md b/documentation/proc-pages/physics-models/pulsed-plant.md
index c48d4620..f3eea47b 100644
--- a/documentation/proc-pages/physics-models/pulsed-plant.md
+++ b/documentation/proc-pages/physics-models/pulsed-plant.md
@@ -29,27 +29,49 @@ change equal to the maximum proposed in [^1], or it can be set by the user. The
constraint is likely to depend on whether the ramp-up is purely inductive or includes current drive,
but this is not taken ito account.
-In the steady-state scenario (`lpulse` = 0), the plasma current ramp-up time `tohs` is determined as follows.
+In the steady-state scenario (`lpulse` = 0), the plasma current ramp-up time `t_current_ramp_up` is determined as follows.
-- If `tohsin` = 0, the rate of change of plasma current is 0.5 MA/s. The PF coil ramp time `tramp`
- and shutdown time `tqnch` are (arbitrarily) set equal to `tohs`.
-- If `tohsin` $\neq$ 0, the plasma current ramp-up time `tohs` = `tohsin`, and the PF coil ramp
+- If `tohsin` = 0, the rate of change of plasma current is 0.5 MA/s. The PF coil ramp time `t_precharge`
+ and shutdown time `t_ramp_down` are (arbitrarily) set equal to `t_current_ramp_up`.
+- If `tohsin` $\neq$ 0, the plasma current ramp-up time `t_current_ramp_up` = `tohsin`, and the PF coil ramp
and shutdown times are input parameters.
-In the pulsed scenario, (`lpulse` = 1), the plasma current ramp-up time `tohs` is an input, and it
+In the pulsed scenario, (`lpulse` = 1), the plasma current ramp-up time `t_current_ramp_up` is an input, and it
can be set as an iteration variable (65). The ramp-up and shutdown time in the pulsed case are set
-equal to `tohs`. To ensure that the plasma current ramp rate during start-up is prevented from being
+equal to `t_current_ramp_up`. To ensure that the plasma current ramp rate during start-up is prevented from being
too high, as governed by the requirement to maintain plasma stability by ensuring that the induced
current has time to diffuse into the body of the plasma, constraint equation no. 41 should be
-turned on with iteration variable no. 66 `ftohs` and input `tohsmn`, the minimum plasma current
+turned on with iteration variable no. 66 `ft_current_ramp_up` and input `t_current_ramp_up_min`, the minimum plasma current
ramp-up time.
## Burn time
The length of the burn time is calculated from the surplus volt-seconds available from the Central
Solenoid and the other PF coils during the plasma burn phase, after the flux required during the
-plasma start-up is taken into account. A minimum burn time (`tbrnmn`) can be enforced via
-constraint equation no. 13 and iteration variable no 21 (`ftburn`).
+plasma start-up is taken into account. A minimum burn time (`t_burn_min`) can be enforced via
+constraint equation no. 13 and iteration variable no 21 (`ft_burn`).
+
+## Currents over time
+
+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.
+- 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.
+
+A plot showing schematically these timings over a pulse can be found in Figure 2.
+
+
## Thermal storage and back-up generation
diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT
index ac73645d..8f746e31 100644
--- a/examples/data/csv_output_large_tokamak_MFILE.DAT
+++ b/examples/data/csv_output_large_tokamak_MFILE.DAT
@@ -557,13 +557,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6699E+02
+ 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)___________________________________________________________ (tburn)_______________________ 7.1999E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6699E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8441E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 9.8441E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0
@@ -806,7 +806,7 @@
CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5000E+00 OP
Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00
Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08
- Minimum_burn_time_(s)___________________________________________________ (tbrnmn)______________________ 7.2000E+03
+ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9935E-03
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 1.8000E+03
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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
@@ -1256,9 +1256,9 @@ powfmax = 3000
* Burn time lower limit *
*-----------------------*
icc = 13
-ixc = 21 * ftburn
+ixc = 21 * ft_burn
* minimum burn time [s]
-tbrnmn = 7200.0
+t_burn_min = 7200.0
* L-H threshold scaling *
*-----------------------*
@@ -1637,13 +1637,13 @@ plasma_res_factor = 0.7
lpulse = 1
* dwell time [s]
-tdwell = 1800.0
+t_between_pulse = 1800.0
* Switch for pulse timing calculations
pulsetimings = 0
* CS ramp up time [s]
-tramp = 500.0
+t_precharge = 500.0
* Current drive *
*---------------*
diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT
index b27363af..ffcb8049 100644
--- a/examples/data/large_tokamak_1_MFILE.DAT
+++ b/examples/data/large_tokamak_1_MFILE.DAT
@@ -555,13 +555,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6631E+02
+ 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)___________________________________________________________ (tburn)_______________________ 7.2035E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6631E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8463E+03 OP
+ 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)______________________________________________ (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
@@ -801,7 +801,7 @@
CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP
Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00
Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08
- Minimum_burn_time_(s)___________________________________________________ (tbrnmn)______________________ 7.2000E+03
+ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 1.8000E+03
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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
@@ -1251,9 +1251,9 @@ powfmax = 3000
* Burn time lower limit *
*-----------------------*
icc = 13
-ixc = 21 * ftburn
+ixc = 21 * ft_burn
* minimum burn time [s]
-tbrnmn = 7200.0
+t_burn_min = 7200.0
* L-H threshold scaling *
*-----------------------*
@@ -1631,13 +1631,13 @@ plasma_res_factor = 0.7
lpulse = 1
* dwell time [s]
-tdwell = 1800.0
+t_between_pulse = 1800.0
* Switch for pulse timing calculations
pulsetimings = 0
* CS ramp up time [s]
-tramp = 500.0
+t_precharge = 500.0
* Current drive *
*---------------*
diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT
index 422e223a..8826c879 100644
--- a/examples/data/large_tokamak_2_MFILE.DAT
+++ b/examples/data/large_tokamak_2_MFILE.DAT
@@ -555,13 +555,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6631E+02
+ 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)___________________________________________________________ (tburn)_______________________ 7.2035E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6631E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8463E+03 OP
+ 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)______________________________________________ (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
@@ -801,7 +801,7 @@
CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP
Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00
Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08
- Minimum_burn_time_(s)___________________________________________________ (tbrnmn)______________________ 7.2000E+03
+ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 1.8000E+03
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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
@@ -1251,9 +1251,9 @@ powfmax = 3000
* Burn time lower limit *
*-----------------------*
icc = 13
-ixc = 21 * ftburn
+ixc = 21 * ft_burn
* minimum burn time [s]
-tbrnmn = 7200.0
+t_burn_min = 7200.0
* L-H threshold scaling *
*-----------------------*
@@ -1631,13 +1631,13 @@ plasma_res_factor = 0.7
lpulse = 1
* dwell time [s]
-tdwell = 1800.0
+t_between_pulse = 1800.0
* Switch for pulse timing calculations
pulsetimings = 0
* CS ramp up time [s]
-tramp = 500.0
+t_precharge = 500.0
* Current drive *
*---------------*
diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT
index 53207efe..0dd4583e 100644
--- a/examples/data/large_tokamak_3_MFILE.DAT
+++ b/examples/data/large_tokamak_3_MFILE.DAT
@@ -555,13 +555,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6631E+02
+ 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)___________________________________________________________ (tburn)_______________________ 7.2035E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6631E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8463E+03 OP
+ 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)______________________________________________ (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
@@ -801,7 +801,7 @@
CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP
Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00
Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08
- Minimum_burn_time_(s)___________________________________________________ (tbrnmn)______________________ 7.2000E+03
+ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 1.8000E+03
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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
@@ -1251,9 +1251,9 @@ powfmax = 3000
* Burn time lower limit *
*-----------------------*
icc = 13
-ixc = 21 * ftburn
+ixc = 21 * ft_burn
* minimum burn time [s]
-tbrnmn = 7200.0
+t_burn_min = 7200.0
* L-H threshold scaling *
*-----------------------*
@@ -1631,13 +1631,13 @@ plasma_res_factor = 0.7
lpulse = 1
* dwell time [s]
-tdwell = 1800.0
+t_between_pulse = 1800.0
* Switch for pulse timing calculations
pulsetimings = 0
* CS ramp up time [s]
-tramp = 500.0
+t_precharge = 500.0
* Current drive *
*---------------*
diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT
index c2cb109c..0027d226 100644
--- a/examples/data/large_tokamak_4_MFILE.DAT
+++ b/examples/data/large_tokamak_4_MFILE.DAT
@@ -555,13 +555,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6631E+02
+ 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)___________________________________________________________ (tburn)_______________________ 7.2035E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6631E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8463E+03 OP
+ 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)______________________________________________ (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
@@ -801,7 +801,7 @@
CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP
Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00
Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08
- Minimum_burn_time_(s)___________________________________________________ (tbrnmn)______________________ 7.2000E+03
+ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 1.8000E+03
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 1.8000E+03
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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
@@ -1251,9 +1251,9 @@ powfmax = 3000
* Burn time lower limit *
*-----------------------*
icc = 13
-ixc = 21 * ftburn
+ixc = 21 * ft_burn
* minimum burn time [s]
-tbrnmn = 7200.0
+t_burn_min = 7200.0
* L-H threshold scaling *
*-----------------------*
@@ -1631,13 +1631,13 @@ plasma_res_factor = 0.7
lpulse = 1
* dwell time [s]
-tdwell = 1800.0
+t_between_pulse = 1800.0
* Switch for pulse timing calculations
pulsetimings = 0
* CS ramp up time [s]
-tramp = 500.0
+t_precharge = 500.0
* Current drive *
*---------------*
diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT
index d686f0f0..901625fc 100644
--- a/examples/data/large_tokamak_IN.DAT
+++ b/examples/data/large_tokamak_IN.DAT
@@ -63,9 +63,9 @@ powfmax = 3000
* Burn time lower limit *
*-----------------------*
icc = 13
-ixc = 21 * ftburn
+ixc = 21 * ft_burn
* minimum burn time [s]
-tbrnmn = 7200.0
+t_burn_min = 7200.0
* L-H threshold scaling *
*-----------------------*
@@ -441,13 +441,13 @@ plasma_res_factor = 0.7
lpulse = 1
* dwell time [s]
-tdwell = 1800.0
+t_between_pulse = 1800.0
* Switch for pulse timing calculations
pulsetimings = 0
* CS ramp up time [s]
-tramp = 500.0
+t_precharge = 500.0
* Current drive *
*---------------*
diff --git a/examples/data/mfile_to_csv_vars.json b/examples/data/mfile_to_csv_vars.json
index d102b4c8..bfc69337 100644
--- a/examples/data/mfile_to_csv_vars.json
+++ b/examples/data/mfile_to_csv_vars.json
@@ -4,7 +4,7 @@
"pinjalw",
"pnetelin",
"ripmax",
- "tbrnmn",
+ "t_burn_min",
"alstroh",
"sig_tf_wp_max",
"thwcndut",
@@ -20,4 +20,4 @@
"divfix",
"rmajor"
]
-}
+}
diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT
index 85850a9f..4c81e395 100644
--- a/examples/data/scan_MFILE.DAT
+++ b/examples/data/scan_MFILE.DAT
@@ -410,13 +410,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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,13 +1405,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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,13 +2400,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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,13 +3395,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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,13 +4390,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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,13 +5385,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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,13 +6380,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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,13 +7375,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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,13 +8370,13 @@
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)________________________ (tramp)_______________________ 5.0000E+02
- Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.8078E+02
+ 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.8078E+02
Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01
- Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.2000E+03 OP
- Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.8078E+02
- Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 0.0000E+00
- Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP
+ 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)______________________________________________ (t_cycle)______________________ 8.0716E+03 OP
kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0
# Radial Build #
Machine_bore_(m)________________________________________________________ (bore)________________________ 2.2626E+00 ITV
@@ -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___________________________________________ (dwell_pump)__________________ 0
- Dwell_time_between_burns_(s)____________________________________________ (tdwell.)_____________________ 0.0000E+00
- CS_ramp-up_time_burns_(s)_______________________________________________ (tramp.)______________________ 5.0000E+02
+ Dwell_time_between_burns_(s)____________________________________________ (t_between_pulse.)_____________________ 0.0000E+00
+ CS_ramp-up_time_burns_(s)_______________________________________________ (t_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
@@ -9112,11 +9112,11 @@ fjprot = 1.0 * F-value for tf coil winding pack current density
flhthresh = 1.271 * F-value for l-h power threshold
fpinj = 1.0 * F-value for injection power
fpnetel = 1.0 * F-value for net electric power
-ftburn = 1.00e+00 * F-value for minimum burn time
+ft_burn = 1.00e+00 * F-value for minimum burn time
fvdump = 0.6116 * F-value for dump voltage
fwalld = 0.1312 * F-value for maximum wall load
pnetelin = 500.0 * Required net electric power (mw)
-tbrnmn = 7.2e3 * Minimum burn time (s)
+t_burn_min = 7.2e3 * Minimum burn time (s)
walalw = 8.0 * Allowable wall-load (mw/m2)
psepbqarmax = 9.2 * maximum ratio of Psep*Bt/qAR (MWT/m)
@@ -9272,9 +9272,9 @@ plasma_res_factor = 0.66 * plasma resistivity pre-factor
*-----------------Pulse Variables------------------*
lpulse = 1 * Switch for reactor model;
-tdwell = 0 * dwell time (s)
+t_between_pulse = 0 * dwell time (s)
pulsetimings = 0
-tramp = 500.0
+t_precharge = 500.0
*-----------------Tfcoil Variables-----------------*
@@ -9310,8 +9310,8 @@ qnuc = 1.292E4
*-----------------Times Variables------------------*
-tburn = 1.0d4 * Burn time (s) (calculated if lpulse=1)
-tburn = 1.0d4 * Burn time (s) (calculated if lpulse=1)
+t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1)
+t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1)
bt = 5.3292E+00
diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT
index 9d42b647..6f1460ff 100644
--- a/examples/data/scan_example_file_IN.DAT
+++ b/examples/data/scan_example_file_IN.DAT
@@ -63,9 +63,9 @@ powfmax = 3000
* Burn time lower limit *
*-----------------------*
icc = 13
-ixc = 21 * ftburn
+ixc = 21 * ft_burn
* minimum burn time [s]
-tbrnmn = 7200.0
+t_burn_min = 7200.0
* L-H threshold scaling *
*-----------------------*
@@ -441,13 +441,13 @@ plasma_res_factor = 0.7
lpulse = 1
* dwell time [s]
-tdwell = 1800.0
+t_between_pulse = 1800.0
* Switch for pulse timing calculations
pulsetimings = 0
* CS ramp up time [s]
-tramp = 500.0
+t_precharge = 500.0
* Current drive *
*---------------*
diff --git a/process/availability.py b/process/availability.py
index d7218b8e..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.tburn / 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.tburn / 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.tburn / 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 13ef0d2a..f7beb029 100644
--- a/process/costs.py
+++ b/process/costs.py
@@ -2590,8 +2590,8 @@ def coelc(self):
* heat_transport_variables.pnetelmw
* (24.0e0 * constants.n_day_year)
* cost_variables.cfactr
- * times_variables.tburn
- / times_variables.tcycle
+ * times_variables.t_burn
+ / times_variables.t_cycle
)
# Costs due to reactor plant
diff --git a/process/evaluators.py b/process/evaluators.py
index 4c9c5fb1..35c68653 100644
--- a/process/evaluators.py
+++ b/process/evaluators.py
@@ -68,7 +68,7 @@ def fcnvmc1(self, n, m, xv, ifail):
logger.debug(f"{pv.rmajor = }")
logger.debug(f"{pv.fusion_power = }")
logger.debug(f"{pv.bt = }")
- logger.debug(f"{tv.tburn = }")
+ logger.debug(f"{tv.t_burn = }")
logger.debug(f"{sqsumconfsq = }")
logger.debug(f"{xv = }")
diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py
index f3b08b26..82a7fd23 100755
--- a/process/io/mfile_comparison.py
+++ b/process/io/mfile_comparison.py
@@ -182,7 +182,7 @@
"pdivt",
"vssoft",
"vstot",
- "tburn",
+ "t_burn",
"bmaxtf",
"iooic",
"tmarg",
diff --git a/process/io/mfile_to_csv_vars.json b/process/io/mfile_to_csv_vars.json
index d102b4c8..bfc69337 100644
--- a/process/io/mfile_to_csv_vars.json
+++ b/process/io/mfile_to_csv_vars.json
@@ -4,7 +4,7 @@
"pinjalw",
"pnetelin",
"ripmax",
- "tbrnmn",
+ "t_burn_min",
"alstroh",
"sig_tf_wp_max",
"thwcndut",
@@ -20,4 +20,4 @@
"divfix",
"rmajor"
]
-}
+}
diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py
index 06568ead..9129f0ed 100644
--- a/process/io/obsolete_vars.py
+++ b/process/io/obsolete_vars.py
@@ -127,6 +127,14 @@
"ftrit": "f_tritium",
"fhe3": "f_helium3",
"falpha": "f_alpha_plasma",
+ "ftburn": "ft_burn",
+ "ftohs": "ft_current_ramp_up",
+ "tbrnmn": "t_burn_min",
+ "tohs": "t_current_ramp_up",
+ "tdwell": "t_between_pulse",
+ "tramp": "t_precharge",
+ "tqnch": "t_ramp_down",
+ "tburn": "t_burn",
}
OBS_VARS_HELP = {
diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py
index ee0bd73d..a2fd1d90 100755
--- a/process/io/plot_proc.py
+++ b/process/io/plot_proc.py
@@ -2481,7 +2481,7 @@ def plot_magnetics_info(axis, mfile_data, scan):
pf_info_3_a = ""
pf_info_3_b = ""
- tburn = mfile_data.data["tburn"].get_scan(scan) / 3600.0
+ t_burn = mfile_data.data["t_burn"].get_scan(scan) / 3600.0
if "i_tf_bucking" in mfile_data.data.keys():
i_tf_bucking = int(mfile_data.data["i_tf_bucking"].get_scan(scan))
@@ -2520,7 +2520,7 @@ def plot_magnetics_info(axis, mfile_data, scan):
(pf_info_3_a, pf_info_3_b, "MA"),
(vssoft, "Startup flux swing", "Wb"),
("vstot", "Available flux swing", "Wb"),
- (tburn, "Burn time", "hrs"),
+ (t_burn, "Burn time", "hrs"),
("", "", ""),
("#TF coil type is {}".format(tftype), "", ""),
("bmaxtfrp", "Peak field at conductor (w. rip.)", "T"),
@@ -2545,7 +2545,7 @@ def plot_magnetics_info(axis, mfile_data, scan):
(pf_info_3_a, pf_info_3_b, "MA"),
(vssoft, "Startup flux swing", "Wb"),
("vstot", "Available flux swing", "Wb"),
- (tburn, "Burn time", "hrs"),
+ (t_burn, "Burn time", "hrs"),
("", "", ""),
("#TF coil type is {}".format(tftype), "", ""),
("bmaxtf", "Peak field at conductor (w. rip.)", "T"),
diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py
index 3ac5d3e0..d5e58ec5 100644
--- a/process/io/plot_radial_build.py
+++ b/process/io/plot_radial_build.py
@@ -168,7 +168,7 @@ def main(args=None):
"bmaxtf", # bmxlim the maximum T field upper limit is the scan variable
"gammax",
"boundl(16)",
- "cnstv.tbrnmn",
+ "cnstv.t_burn_min",
"",
"cfactr",
"boundu(72)",
diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py
index 67e57d1f..5470be07 100644
--- a/process/io/plot_scans.py
+++ b/process/io/plot_scans.py
@@ -228,7 +228,7 @@ def main(args=None):
] = "bmaxtf" # bmxlim the maximum T field upper limit is the scan variable
nsweep_dict[18] = "gammax"
nsweep_dict[19] = "boundl(16)"
- nsweep_dict[20] = "cnstv.tbrnmn"
+ nsweep_dict[20] = "cnstv.t_burn_min"
nsweep_dict[21] = ""
nsweep_dict[22] = "cfactr"
nsweep_dict[23] = "boundu(72)"
diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py
index a5aded41..45cb2b2c 100644
--- a/process/io/variable_metadata.py
+++ b/process/io/variable_metadata.py
@@ -266,7 +266,7 @@ class VariableMetadata:
"zeff": VariableMetadata(
latex=r"$Z_{\mathrm{eff}}$", description="Effective charge", units=""
),
- "tburn": VariableMetadata(
+ "t_burn": VariableMetadata(
latex=r"$t_{\mathrm{burn}}$[$s$]", description="Burn time", units="s"
),
"vburn": VariableMetadata(
@@ -292,7 +292,7 @@ class VariableMetadata:
description="Cross-sectional area of CS coil turns",
units="m^2",
),
- "tbrnmn": VariableMetadata(
+ "t_burn_min": VariableMetadata(
latex=r"$t_{\mathrm{burn.min}}$[$s$]",
description="Minimum burn time",
units="s",
diff --git a/process/pfcoil.py b/process/pfcoil.py
index c52299e1..ede1bb17 100644
--- a/process/pfcoil.py
+++ b/process/pfcoil.py
@@ -117,11 +117,11 @@ def pfcoil(self):
# Set up array of times
tv.tim[0] = 0.0e0
- tv.tim[1] = tv.tramp
- tv.tim[2] = tv.tim[1] + tv.tohs
+ tv.tim[1] = tv.t_precharge
+ tv.tim[2] = tv.tim[1] + tv.t_current_ramp_up
tv.tim[3] = tv.tim[2] + tv.t_fusion_ramp
- tv.tim[4] = tv.tim[3] + tv.tburn
- tv.tim[5] = tv.tim[4] + tv.tqnch
+ tv.tim[4] = tv.tim[3] + tv.t_burn
+ tv.tim[5] = tv.tim[4] + tv.t_ramp_down
# Set up call to MHD scaling routine for coil currents.
# First break up Central Solenoid solenoid into 'filaments'
@@ -506,15 +506,15 @@ def pfcoil(self):
pf.ccl0[nng] = 1.0e6 * pfv.ccl0_ma[nng]
pf.ccls[nng] = 1.0e6 * pfv.ccls_ma[nng]
- # Beginning of pulse: t = tv.tramp
+ # Beginning of pulse: t = tv.t_precharge
pfv.curpfs[ncl] = 1.0e-6 * pf.ccl0[nng]
- # Beginning of flat-top: t = tv.tramp+tv.tohs
+ # Beginning of flat-top: t = tv.t_precharge+tv.t_current_ramp_up
pfv.curpff[ncl] = 1.0e-6 * (
pf.ccls[nng] - (pf.ccl0[nng] * pfv.fcohbof / pfv.fcohbop)
)
- # End of flat-top: t = tv.tramp+tv.tohs+tv.t_fusion_ramp+tv.tburn
+ # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_fusion_ramp+tv.t_burn
pfv.curpfb[ncl] = 1.0e-6 * (
pf.ccls[nng] - (pf.ccl0[nng] * (1.0e0 / pfv.fcohbop))
)
@@ -2136,8 +2136,8 @@ def outpf(self):
op.ovarre(
self.outfile,
"Minimum burn time (s)",
- "(tbrnmn)",
- ctv.tbrnmn,
+ "(t_burn_min)",
+ ctv.t_burn_min,
)
op.ovarre(
self.outfile,
@@ -2514,7 +2514,7 @@ def outvolt(self):
op.oheadr(self.outfile, "Volt Second Consumption")
op.write(self.outfile, "\t" * 3 + "volt-sec\t\t\tvolt-sec\t\tvolt-sec")
- op.write(self.outfile, "\t" * 3 + "start-up\t\t\tburn\t\t\ttotal")
+ op.write(self.outfile, "\t" * 3 + "start-up\t\t\t_burn\t\t\ttotal")
op.write(
self.outfile,
f"PF coils:\t\t{pfv.vsefsu:.2f}\t\t\t\t{pfv.vsefbn:.2f}\t\t\t{pfv.vseft:.2f}",
@@ -2696,19 +2696,19 @@ def waveform(self):
for ic in range(pfv.nohc):
# Find where the peak current occurs
- # Beginning of pulse, t = tramp
+ # Beginning of pulse, t = t_precharge
if (abs(pfv.curpfs[ic]) >= abs(pfv.curpfb[ic])) and (
abs(pfv.curpfs[ic]) >= abs(pfv.curpff[ic])
):
pfv.ric[ic] = pfv.curpfs[ic]
- # Beginning of flat-top, t = tramp + tohs
+ # Beginning of flat-top, t = t_precharge + t_current_ramp_up
if (abs(pfv.curpff[ic]) >= abs(pfv.curpfb[ic])) and (
abs(pfv.curpff[ic]) >= abs(pfv.curpfs[ic])
):
pfv.ric[ic] = pfv.curpff[ic]
- # End of flat-top, t = tramp + tohs + t_fusion_ramp + tburn
+ # End of flat-top, t = t_precharge + t_current_ramp_up + t_fusion_ramp + t_burn
if (abs(pfv.curpfb[ic]) >= abs(pfv.curpfs[ic])) and (
abs(pfv.curpfb[ic]) >= abs(pfv.curpff[ic])
):
diff --git a/process/physics.py b/process/physics.py
index 42d4d64c..6402c945 100644
--- a/process/physics.py
+++ b/process/physics.py
@@ -67,7 +67,7 @@ def vscalc(
rplas,
plasma_current,
t_fusion_ramp,
- tburn,
+ t_burn,
rli,
rmu0,
):
@@ -83,7 +83,7 @@ def vscalc(
rmajor : input real : plasma major radius (m)
rplas : input real : plasma resistance (ohm)
t_fusion_ramp : input real : heating time (s)
- tburn : input real : burn time (s)
+ t_burn : input real : burn time (s)
phiint : output real : internal plasma volt-seconds (Wb)
rlp : output real : plasma inductance (H)
vsbrn : output real : volt-seconds needed during flat-top (heat+burn) (Wb)
@@ -127,11 +127,11 @@ def vscalc(
vburn = plasma_current * rplas * inductive_current_fraction * csawth
- # N.B. tburn on first iteration will not be correct
+ # N.B. t_burn on first iteration will not be correct
# if the pulsed reactor option is used, but the value
# will be correct on subsequent calls.
- vsbrn = vburn * (t_fusion_ramp + tburn)
+ vsbrn = vburn * (t_fusion_ramp + t_burn)
vsstt = vsstt + vsbrn
return phiint, rlp, vsbrn, vsind, vsres, vsstt
@@ -1562,54 +1562,60 @@ def physics(self):
# Set PF coil ramp times
if pulse_variables.lpulse != 1:
if times_variables.tohsin == 0.0e0:
- times_variables.tohs = physics_variables.plasma_current / 5.0e5
- times_variables.tramp = times_variables.tohs
- times_variables.tqnch = times_variables.tohs
+ 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_ramp_down = times_variables.t_current_ramp_up
else:
- times_variables.tohs = times_variables.tohsin
+ times_variables.t_current_ramp_up = times_variables.tohsin
else:
if times_variables.pulsetimings == 0.0e0:
- # times_variables.tramp is input
- times_variables.tohs = physics_variables.plasma_current / 1.0e5
- times_variables.tqnch = times_variables.tohs
+ # times_variables.t_precharge is input
+ times_variables.t_current_ramp_up = (
+ physics_variables.plasma_current / 1.0e5
+ )
+ times_variables.t_ramp_down = times_variables.t_current_ramp_up
else:
- # times_variables.tohs is set either in INITIAL or INPUT, or by being
+ # times_variables.t_current_ramp_up is set either in INITIAL or INPUT, or by being
# iterated using limit equation 41.
- times_variables.tramp = max(times_variables.tramp, times_variables.tohs)
- # tqnch = max(tqnch,tohs)
- times_variables.tqnch = times_variables.tohs
+ times_variables.t_precharge = max(
+ times_variables.t_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
- # Reset second times_variables.tburn value (times_variables.tburn0).
+ # Reset second times_variables.t_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.tburn0 = times_variables.tburn
+ times_variables.t_burn_0 = times_variables.t_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.tpulse = (
- times_variables.tohs
+ times_variables.t_pulse_repetition = (
+ times_variables.t_current_ramp_up
+ times_variables.t_fusion_ramp
- + times_variables.tburn
- + times_variables.tqnch
+ + times_variables.t_burn
+ + times_variables.t_ramp_down
)
times_variables.tdown = (
- times_variables.tramp
- + times_variables.tohs
- + times_variables.tqnch
- + times_variables.tdwell
+ times_variables.t_precharge
+ + times_variables.t_current_ramp_up
+ + times_variables.t_ramp_down
+ + times_variables.t_between_pulse
)
# Total cycle time
- times_variables.tcycle = (
- times_variables.tramp
- + times_variables.tohs
+ times_variables.t_cycle = (
+ times_variables.t_precharge
+ + times_variables.t_current_ramp_up
+ times_variables.t_fusion_ramp
- + times_variables.tburn
- + times_variables.tqnch
- + times_variables.tdwell
+ + times_variables.t_burn
+ + times_variables.t_ramp_down
+ + times_variables.t_between_pulse
)
# ***************************** #
@@ -2227,7 +2233,7 @@ def physics(self):
physics_variables.rplas,
physics_variables.plasma_current,
times_variables.t_fusion_ramp,
- times_variables.tburn,
+ times_variables.t_burn,
physics_variables.rli,
constants.rmu0,
)
@@ -3103,14 +3109,14 @@ def outtim(self):
po.ovarrf(
self.outfile,
"Initial charge time for CS from zero current (s)",
- "(tramp)",
- times_variables.tramp,
+ "(t_precharge)",
+ times_variables.t_precharge,
)
po.ovarrf(
self.outfile,
"Plasma current ramp-up time (s)",
- "(tohs)",
- times_variables.tohs,
+ "(t_current_ramp_up)",
+ times_variables.t_current_ramp_up,
)
po.ovarrf(
self.outfile,
@@ -3119,23 +3125,26 @@ def outtim(self):
times_variables.t_fusion_ramp,
)
po.ovarre(
- self.outfile, "Burn time (s)", "(tburn)", times_variables.tburn, "OP "
+ self.outfile, "Burn time (s)", "(t_burn)", times_variables.t_burn, "OP "
)
po.ovarrf(
self.outfile,
"Reset time to zero current for CS (s)",
- "(tqnch)",
- times_variables.tqnch,
+ "(t_ramp_down)",
+ times_variables.t_ramp_down,
)
po.ovarrf(
- self.outfile, "Time between pulses (s)", "(tdwell)", times_variables.tdwell
+ self.outfile,
+ "Time between pulses (s)",
+ "(t_between_pulse)",
+ times_variables.t_between_pulse,
)
po.oblnkl(self.outfile)
po.ovarre(
self.outfile,
"Total plant cycle time (s)",
- "(tcycle)",
- times_variables.tcycle,
+ "(t_cycle)",
+ times_variables.t_cycle,
"OP ",
)
diff --git a/process/power.py b/process/power.py
index b3162b64..9ec86321 100644
--- a/process/power.py
+++ b/process/power.py
@@ -141,7 +141,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.tohs
+ delktim = times_variables.t_current_ramp_up
# PF system (including Central Solenoid solenoid) inductive MVA requirements
# pfcoil_variables.cpt(i,j) : current per turn of coil i at (end) time period j (A)
@@ -791,7 +791,7 @@ def power1(self):
structure_variables.coldmass,
fwbs_variables.ptfnuc,
pf_power_variables.ensxpfm,
- times_variables.tpulse,
+ times_variables.t_pulse_repetition,
tfcoil_variables.cpttf,
tfcoil_variables.n_tf,
)
@@ -2054,22 +2054,22 @@ def power3(self, output: bool):
p_int_tot = numpy.zeros((6,))
p_gross = numpy.zeros((6,))
- t_cs = times_variables.tramp
+ t_cs = times_variables.t_precharge
# Plasma current ramp up time (s)
- t_ip_up = times_variables.tohs
+ t_ip_up = times_variables.t_current_ramp_up
# Plasma heating phase (s)
t_heat = times_variables.t_fusion_ramp
# Flat-top phase (s)
- t_flat_top = times_variables.tburn
+ t_flat_top = times_variables.t_burn
# Plasma current ramp down time (s)
- t_ip_down = times_variables.tqnch
+ t_ip_down = times_variables.t_ramp_down
# Extra time between pulses (s)
- t_extra = times_variables.tdwell
+ t_extra = times_variables.t_between_pulse
# Continuous power usage
@@ -2143,7 +2143,10 @@ def power3(self, output: bool):
po.write(self.outfile, "Pulse timings [s]:")
po.oblnkl(self.outfile)
- po.write(self.outfile, "tramp tohs t_fusion_ramp tburn tqnch tdwell")
+ po.write(
+ self.outfile,
+ "t_precharge t_current_ramp_up t_fusion_ramp t_burn t_ramp_down t_between_pulse",
+ )
po.write(self.outfile, "----- ---- ----- ----- ----- ------")
po.write(
self.outfile,
@@ -2154,7 +2157,10 @@ def power3(self, output: bool):
po.write(self.outfile, "Continous power usage [MWe]:")
po.oblnkl(self.outfile)
- po.write(self.outfile, "System tramp tohs t_fusion_ramp tburn tqnch tdwell")
+ po.write(
+ self.outfile,
+ "System t_precharge t_current_ramp_up t_fusion_ramp t_burn t_ramp_down t_between_pulse",
+ )
po.write(self.outfile, "------ ----- ---- ----- ----- ----- ------")
po.write(
self.outfile,
@@ -2203,7 +2209,10 @@ def power3(self, output: bool):
po.write(self.outfile, "Intermittent power usage [MWe]:")
po.oblnkl(self.outfile)
- po.write(self.outfile, "System tramp tohs t_fusion_ramp tburn tqnch tdwell")
+ po.write(
+ self.outfile,
+ "System t_precharge t_current_ramp_up t_fusion_ramp t_burn t_ramp_down t_between_pulse",
+ )
po.write(self.outfile, "------ ----- ---- ----- ----- ----- ------")
po.write(
self.outfile,
@@ -2229,7 +2238,10 @@ def power3(self, output: bool):
po.write(self.outfile, "Power production [MWe]:")
po.oblnkl(self.outfile)
- po.write(self.outfile, " tramp tohs t_fusion_ramp tburn tqnch tdwell avg")
+ po.write(
+ self.outfile,
+ " t_precharge t_current_ramp_up t_fusion_ramp t_burn t_ramp_down t_between_pulse avg",
+ )
po.write(self.outfile, " ----- ---- ----- ----- ----- ------ ---")
po.write(
self.outfile,
@@ -2253,7 +2265,15 @@ def power3(self, output: bool):
# 40 format(t20,a20,t40,f8.2,t50,f8.2,t60,f8.2,t70,f8.2,t80,f8.2,t90,f8.2,t100,f8.2,t110,f8.2)
def cryo(
- self, i_tf_sup, tfcryoarea, coldmass, ptfnuc, ensxpfm, tpulse, cpttf, n_tf
+ self,
+ i_tf_sup,
+ tfcryoarea,
+ coldmass,
+ ptfnuc,
+ ensxpfm,
+ t_pulse_repetition,
+ cpttf,
+ n_tf,
):
"""
Calculates cryogenic loads
@@ -2266,7 +2286,7 @@ def cryo(
intercoil structure
ptfnuc : input real : Nuclear heating in TF coils (MW)
ensxpfm : input real : Maximum PF coil stored energy (MJ)
- tpulse : input real : Pulse length of cycle (s)
+ t_pulse_repetition : input real : Pulse length of cycle (s)
cpttf : 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)
@@ -2283,7 +2303,7 @@ def cryo(
# Issue #511: if fwbs_variables.inuclear = 1 : fwbs_variables.qnuc is input.
# AC losses
- self.qac = 1.0e3 * ensxpfm / tpulse
+ self.qac = 1.0e3 * ensxpfm / t_pulse_repetition
# Current leads
if i_tf_sup == 1:
@@ -2517,7 +2537,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/(tohs + tramp)
+ # tfreacmw = 1.0e-6 * 1.0e9 * estotf/(t_current_ramp_up + t_precharge)
# estotf(=estotftgj/tfcoil_variables.n_tf) has been removed (#199 #847)
tfreacmw = 0.0e0
diff --git a/process/pulse.py b/process/pulse.py
index 6727c007..b24c09d8 100755
--- a/process/pulse.py
+++ b/process/pulse.py
@@ -97,7 +97,7 @@ def tohswg(self, output: bool) -> None:
# Minimum plasma current ramp-up time (s)
# - corrected (bus resistance is not a function of pfcoil_variables.turns)
- constraint_variables.tohsmn = (
+ constraint_variables.t_current_ramp_up_min = (
loh
* (ioht2 - ioht1)
/ (
@@ -115,8 +115,8 @@ def tohswg(self, output: bool) -> None:
po.ovarre(
self.outfile,
"Minimum plasma current ramp-up time (s)",
- "(tohsmn)",
- constraint_variables.tohsmn,
+ "(t_current_ramp_up_min)",
+ constraint_variables.t_current_ramp_up_min,
)
def burn(self, output: bool):
@@ -165,7 +165,7 @@ def burn(self, output: bool):
error_handling.fdiags[3] = times_variables.t_fusion_ramp
error_handling.report_error(93)
- times_variables.tburn = max(0.0e0, tb)
+ times_variables.t_burn = max(0.0e0, tb)
# Output section
diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json
index e76a09da..62b0aa87 100644
--- a/process/utilities/errorlist.json
+++ b/process/utilities/errorlist.json
@@ -258,7 +258,7 @@
{
"no": 50,
"level": 3,
- "message": "LOADXC: Do not use tohs as an iteration variable if lpulse /= 1"
+ "message": "LOADXC: Do not use t_current_ramp_up as an iteration variable if lpulse /= 1"
},
{
"no": 51,
diff --git a/process/vacuum.py b/process/vacuum.py
index 77da8101..d5195dd0 100644
--- a/process/vacuum.py
+++ b/process/vacuum.py
@@ -63,7 +63,7 @@ def run(self, output: bool) -> None:
buv.tfcth,
buv.rsldi - buv.gapds - buv.d_vv_in,
tfv.n_tf,
- tv.tdwell,
+ tv.t_between_pulse,
pv.dene,
pv.idivrt,
qtorus,
@@ -109,9 +109,9 @@ def vacuum_simple(self, output) -> float:
wallarea = (pv.sarea / 1084.0e0) * 2000.0e0
# Required pumping speed for pump-down
- pumpdownspeed = (vacv.outgasfactor * wallarea / vacv.pbase) * tv.tdwell ** (
- -vacv.outgasindex
- )
+ pumpdownspeed = (
+ vacv.outgasfactor * wallarea / vacv.pbase
+ ) * tv.t_between_pulse ** (-vacv.outgasindex)
# Number of pumps required for pump-down
npumpdown = pumpdownspeed / pumpspeed
@@ -155,7 +155,9 @@ def vacuum_simple(self, output) -> float:
"OP ",
)
- po.ovarre(self.outfile, "Dwell time", "(tdwell)", tv.tdwell)
+ po.ovarre(
+ self.outfile, "Dwell time", "(t_between_pulse)", tv.t_between_pulse
+ )
po.ovarre(
self.outfile,
"Number of pumps required for pump-down",
@@ -186,7 +188,7 @@ def vacuum(
thtf,
ritf,
n_tf,
- tdwell,
+ t_between_pulse,
nplasma,
ndiv,
qtorus,
@@ -235,7 +237,7 @@ def vacuum(
:param tfno: Number of TF coils
:type : int
- :param tdwell: Dwell time between pulses (s)
+ :param t_between_pulse: Dwell time between pulses (s)
:type : float
:param nplasma: Plasma density (m**-3)
@@ -324,7 +326,7 @@ def vacuum(
# Pumpdown between burns
# s(2) = net pump speed (DT) required for pumpdown between burns (m^3/s)
# tn = temperature of neutral gas in chamber (K)
- # tdwell = dwell time between burns (s)
+ # t_between_pulse = dwell time between burns (s)
pend = (
0.5e0 * nplasma * k * vacv.tn
@@ -338,12 +340,12 @@ def vacuum(
volume = plasma_vol * (aw + dsol) * (aw + dsol) / (aw * aw)
# dwell pumping options
- if (vacv.dwell_pump == 1) or (tdwell == 0):
- tpump = tv.tramp
+ if (vacv.dwell_pump == 1) or (t_between_pulse == 0):
+ tpump = tv.t_precharge
elif vacv.dwell_pump == 2:
- tpump = tdwell + tv.tramp
+ tpump = t_between_pulse + tv.t_precharge
else:
- tpump = tdwell
+ tpump = t_between_pulse
s.append(volume / tpump * math.log(pend / pstart))
@@ -556,8 +558,18 @@ def vacuum(
"(dwell_pump)",
vacv.dwell_pump,
)
- po.ovarre(self.outfile, "Dwell time between burns (s)", "(tdwell.)", tdwell)
- po.ovarre(self.outfile, "CS ramp-up time burns (s)", "(tramp.)", tv.tramp)
+ po.ovarre(
+ self.outfile,
+ "Dwell time between burns (s)",
+ "(t_between_pulse.)",
+ t_between_pulse,
+ )
+ po.ovarre(
+ self.outfile,
+ "CS ramp-up time burns (s)",
+ "(t_precharge.)",
+ tv.t_precharge,
+ )
po.ovarre(
self.outfile,
"Allowable pumping time between burns (s)",
diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90
index 8860d4a1..6fe641f5 100755
--- a/source/fortran/constraint_equations.f90
+++ b/source/fortran/constraint_equations.f90
@@ -901,14 +901,14 @@ subroutine constraint_eqn_013(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
!! residual error in physical units; output string; units string
!! Equation for burn time lower limit
!! #=# times
- !! #=#=# ftburn, tbrnmn
+ !! #=#=# ft_burn, t_burn_min
!! and hence also optional here.
!! Logic change during pre-factoring: err, symbol, units will be assigned only if present.
- !! ftburn : input real : f-value for minimum burn time
- !! tburn : input real : burn time (s) (calculated if lpulse=1)
- !! tbrnmn : input real : minimum burn time (s)
- use constraint_variables, only: ftburn,tbrnmn
- use times_variables, only: tburn
+ !! ft_burn : input real : f-value for minimum burn time
+ !! t_burn : input real : burn time (s) (calculated if lpulse=1)
+ !! t_burn_min : input real : minimum burn time (s)
+ use constraint_variables, only: ft_burn,t_burn_min
+ use times_variables, only: t_burn
implicit none
real(dp), intent(out) :: tmp_cc
real(dp), intent(out) :: tmp_con
@@ -916,9 +916,9 @@ subroutine constraint_eqn_013(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
character(len=1), intent(out) :: tmp_symbol
character(len=10), intent(out) :: tmp_units
- tmp_cc = 1.0D0 - ftburn * tburn/tbrnmn
- tmp_con = tbrnmn / ftburn
- tmp_err = tbrnmn / ftburn - tburn
+ tmp_cc = 1.0D0 - ft_burn * t_burn/t_burn_min
+ tmp_con = t_burn_min / ft_burn
+ tmp_err = t_burn_min / ft_burn - t_burn
tmp_symbol = '>'
tmp_units = 'sec'
@@ -1817,14 +1817,14 @@ subroutine constraint_eqn_041(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
!! residual error in physical units; output string; units string
!! Equation for plasma current ramp-up time lower limit
!! #=# times
- !! #=#=# ftohs, tohsmn
+ !! #=#=# ft_current_ramp_up, t_current_ramp_up_min
!! and hence also optional here.
!! Logic change during pre-factoring: err, symbol, units will be assigned only if present.
- !! ftohs : input real : f-value for plasma current ramp-up time
- !! tohs : input real : plasma current ramp-up time for current initiation (s)
- !! tohsmn : input real : minimum plasma current ramp-up time (s)
- use constraint_variables, only: ftohs, tohsmn
- use times_variables, only: tohs
+ !! ft_current_ramp_up : input real : f-value for plasma current ramp-up time
+ !! t_current_ramp_up : input real : plasma current ramp-up time for current initiation (s)
+ !! t_current_ramp_up_min : input real : minimum plasma current ramp-up time (s)
+ use constraint_variables, only: ft_current_ramp_up, t_current_ramp_up_min
+ use times_variables, only: t_current_ramp_up
implicit none
real(dp), intent(out) :: tmp_cc
real(dp), intent(out) :: tmp_con
@@ -1832,9 +1832,9 @@ subroutine constraint_eqn_041(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
character(len=1), intent(out) :: tmp_symbol
character(len=10), intent(out) :: tmp_units
- tmp_cc = 1.0D0 - ftohs * tohs/tohsmn
- tmp_con = tohsmn * (1.0D0 - tmp_cc)
- tmp_err = tohsmn * tmp_cc
+ tmp_cc = 1.0D0 - ft_current_ramp_up * t_current_ramp_up/t_current_ramp_up_min
+ tmp_con = t_current_ramp_up_min * (1.0D0 - tmp_cc)
+ tmp_err = t_current_ramp_up_min * tmp_cc
tmp_symbol = '>'
tmp_units = 'sec'
@@ -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/constraint_variables.f90 b/source/fortran/constraint_variables.f90
index de00506c..ed344127 100644
--- a/source/fortran/constraint_variables.f90
+++ b/source/fortran/constraint_variables.f90
@@ -182,7 +182,7 @@ module constraint_variables
real(dp) :: ftbr
!! f-value for minimum tritium breeding ratio (`constraint equation 52`, `iteration variable 89`)
- real(dp) :: ftburn
+ real(dp) :: ft_burn
!! f-value for minimum burn time (`constraint equation 13`, `iteration variable 21`)
real(dp) :: ftcycl
@@ -195,7 +195,7 @@ module constraint_variables
real(dp) :: ftmargtf
!! f-value for TF coil temperature margin (`constraint equation 36`, `iteration variable 54`)
- real(dp) :: ftohs
+ real(dp) :: ft_current_ramp_up
!! f-value for plasma current ramp-up time (`constraint equation 41`, `iteration variable 66`)
real(dp) :: ftpeak
@@ -263,13 +263,13 @@ module constraint_variables
real(dp) :: tbrmin
!! minimum tritium breeding ratio (`constraint equation 52`)
- real(dp) :: tbrnmn
+ real(dp) :: t_burn_min
!! minimum burn time (s) (KE - no longer itv., see issue #706)
real(dp) :: tcycmn
!! minimum cycle time (s) (`constraint equation 42`)
- real(dp) :: tohsmn
+ real(dp) :: t_current_ramp_up_min
!! minimum plasma current ramp-up time (s) (`constraint equation 41`)
real(dp) :: vvhealw
@@ -360,11 +360,11 @@ subroutine init_constraint_variables
fstr_wp = 1.0D0
fmaxvvstress = 1.0D0
ftbr = 1.0D0
- ftburn = 1.0D0
+ ft_burn = 1.0D0
ftcycl = 1.0D0
ftmargoh = 1.0D0
ftmargtf = 1.0D0
- ftohs = 1.0D0
+ ft_current_ramp_up = 1.0D0
ftpeak = 1.0D0
fvdump = 1.0D0
fvs = 1.0D0
@@ -385,9 +385,9 @@ subroutine init_constraint_variables
pseprmax = 25.0D0
ptfnucmax = 1.0D-3
tbrmin = 1.1D0
- tbrnmn = 1.0D0
+ t_burn_min = 1.0D0
tcycmn = 0.0D0
- tohsmn = 1.0D0
+ t_current_ramp_up_min = 1.0D0
vvhealw = 1.0D0
walalw = 1.0D0
taulimit = 5.0D0
diff --git a/source/fortran/evaluators.f90 b/source/fortran/evaluators.f90
index d814544f..7a79c03d 100644
--- a/source/fortran/evaluators.f90
+++ b/source/fortran/evaluators.f90
@@ -104,7 +104,7 @@ subroutine funfom(fc)
use pf_power_variables, only: srcktpm
use process_output, only: int_to_string3
use tfcoil_variables, only: tfcmw
- use times_variables, only: tburn
+ use times_variables, only: t_burn
implicit none
! Arguments
@@ -178,7 +178,7 @@ subroutine funfom(fc)
stop 1
case (14) ! pulse length
- fc = sgn * tburn / 2.0D4
+ fc = sgn * t_burn / 2.0D4
case (15) ! plant availability factor (N.B. requires iavail = 1)
@@ -187,7 +187,7 @@ subroutine funfom(fc)
fc = sgn * cfactr
case (16) ! major radius/burn time
- fc = sgn * ( 0.95d0 * (rmajor/9.0d0) - 0.05d0 * (tburn/7200.d0) )
+ fc = sgn * ( 0.95d0 * (rmajor/9.0d0) - 0.05d0 * (t_burn/7200.d0) )
case (17) ! net electrical output
fc = sgn * pnetelmw / 500.0d0
@@ -196,7 +196,7 @@ subroutine funfom(fc)
fc = 1d0
case (19) ! major radius/burn time
- fc = sgn * ( -0.5d0 * (bigq/20.0D0) - 0.5d0 * (tburn/7200.d0) )
+ fc = sgn * ( -0.5d0 * (bigq/20.0D0) - 0.5d0 * (t_burn/7200.d0) )
case default
idiags(1) = iab ; call report_error(24)
diff --git a/source/fortran/init_module.f90 b/source/fortran/init_module.f90
index f33cc770..1b49da3b 100644
--- a/source/fortran/init_module.f90
+++ b/source/fortran/init_module.f90
@@ -161,7 +161,7 @@ subroutine init
'been an escape from a failed line search.'
write(vfile,'(a80)') 'odd/even is a convenient plotting bit.'
write(vfile,'(100a13)') 'nviter','escape', 'odd/even', 'te','coe','rmajor', &
- 'fusion_power','bt','tburn','sqsumsq', (lablxc(ixc(i)),i=1,nvar)
+ 'fusion_power','bt','t_burn','sqsumsq', (lablxc(ixc(i)),i=1,nvar)
end if
end subroutine init
diff --git a/source/fortran/input.f90 b/source/fortran/input.f90
index 5c405182..9a17e6a3 100644
--- a/source/fortran/input.f90
+++ b/source/fortran/input.f90
@@ -233,12 +233,12 @@ subroutine parse_input_file(in_file,out_file,show_changes)
maxradwallload, pseprmax, fdene, fniterpump, fpinj, pnetelin, powfmax, &
fgamcd, ftbr, mvalim, taulimit, walalw, fmva, fradpwr, nflutfmax, fipir, &
fauxmn, fiooic, fcwr, fjohc0, frminor, psepbqarmax, ftpeak, bigqmin, &
- fstrcond, fptemp, ftmargoh, fvs, fbetatry, vvhealw, fpnetel, ftburn, &
+ fstrcond, fptemp, ftmargoh, fvs, fbetatry, vvhealw, fpnetel, ft_burn, &
ffuspow, fpsepr, ptfnucmax, fvdump, pdivtlim, ftaulimit, nbshinefmax, &
fcqt, fzeffmax, fstrcase, fhldiv, foh_stress, fwalld, gammax, fjprot, &
- ftohs, tcycmn, auxmin, zeffmax, peakfactrad, fdtmp, fpoloidalpower, &
+ ft_current_ramp_up, tcycmn, auxmin, zeffmax, peakfactrad, fdtmp, fpoloidalpower, &
fnbshinef, freinke, fvvhe, fqval, fq, fmaxvvstress, fbetap, fbeta, fjohc, &
- fflutf, bmxlim, tbrnmn, fbetatry_lower, fecrh_ignition, fstr_wp, fncycle
+ fflutf, bmxlim, t_burn_min, fbetatry_lower, fecrh_ignition, fstr_wp, fncycle
use cost_variables, only: ucich, uctfsw, dintrt, ucblbe, uubop, dtlife, &
cost_factor_vv, cfind, uccry, fcap0cp, uccase, uuves, cconshtf, conf_mag, &
ucbllipb, ucfuel, uumag, ucpfbs, ireactor, uucd, div_umain_time, div_nu, &
@@ -345,8 +345,8 @@ subroutine parse_input_file(in_file,out_file,show_changes)
sig_tf_wp_max, eyoung_cond_trans, i_tf_cond_eyoung_axial, i_tf_cond_eyoung_trans, &
str_wp_max, str_tf_con_res, i_str_wp, max_vv_stress, theta1_coil, theta1_vv
- use times_variables, only: tohs, pulsetimings, tqnch, t_fusion_ramp, tramp, tburn, &
- tdwell, tohsin
+ use times_variables, only: t_current_ramp_up, pulsetimings, t_ramp_down, t_fusion_ramp, t_precharge, t_burn, &
+ t_between_pulse, tohsin
use vacuum_variables, only: dwell_pump, pbase, tn, pumpspeedfactor, &
initialpressure, outgasfactor, prdiv, pumpspeedmax, rat, outgasindex, &
pumpareafraction, ntype, vacuum_model, pumptp
@@ -924,8 +924,8 @@ subroutine parse_input_file(in_file,out_file,show_changes)
case ('ftbr')
call parse_real_variable('ftbr', ftbr, 0.001D0, 10.0D0, &
'F-value for tritium breeding ratio limit')
- case ('ftburn')
- call parse_real_variable('ftburn', ftburn, 0.001D0, 10.0D0, &
+ case ('ft_burn')
+ call parse_real_variable('ft_burn', ft_burn, 0.001D0, 10.0D0, &
'F-value for burn time limit')
case ('ftcycl')
call parse_real_variable('ftcycl', ftcycl, 0.001D0, 10.0D0, &
@@ -937,8 +937,8 @@ subroutine parse_input_file(in_file,out_file,show_changes)
call parse_real_variable('ftmargoh', ftmargoh, 0.001D0, 10.0D0, &
'F-value for TF coil temp. margin')
- case ('ftohs')
- call parse_real_variable('ftohs', ftohs, 0.001D0, 10.0D0, &
+ case ('ft_current_ramp_up')
+ call parse_real_variable('ft_current_ramp_up', ft_current_ramp_up, 0.001D0, 10.0D0, &
'F-value for plasma current ramp-up time')
case ('ftpeak')
call parse_real_variable('ftpeak', ftpeak, 0.001D0, 10.0D0, &
@@ -1018,8 +1018,8 @@ subroutine parse_input_file(in_file,out_file,show_changes)
case ('tbrmin')
call parse_real_variable('tbrmin', tbrmin, 0.001D0, 2.0D0, &
'Minimum tritium breeding ratio')
- case ('tbrnmn')
- call parse_real_variable('tbrnmn', tbrnmn, 1.0D-3, 1.0D6, &
+ case ('t_burn_min')
+ call parse_real_variable('t_burn_min', t_burn_min, 1.0D-3, 1.0D6, &
'Minimum burn time (s)')
case ('tcycmn')
call parse_real_variable('tcycmn', tcycmn, 1.0D-3, 2.0D6, &
@@ -1112,26 +1112,26 @@ subroutine parse_input_file(in_file,out_file,show_changes)
! Time settings
- case ('tburn')
- call parse_real_variable('tburn', tburn, 0.0D0, 1.0D8, &
+ case ('t_burn')
+ call parse_real_variable('t_burn', t_burn, 0.0D0, 1.0D8, &
'Burn time (s)')
- case ('tdwell')
- call parse_real_variable('tdwell', tdwell, 0.0D0, 1.0D8, &
+ case ('t_between_pulse')
+ call parse_real_variable('t_between_pulse', t_between_pulse, 0.0D0, 1.0D8, &
'Time between burns (s)')
case ('t_fusion_ramp')
call parse_real_variable('t_fusion_ramp', t_fusion_ramp, 0.0D0, 1.0D4, &
'Heating time after current ramp (s)')
- case ('tohs')
- call parse_real_variable('tohs', tohs, 0.0D0, 1.0D4, &
+ case ('t_current_ramp_up')
+ call parse_real_variable('t_current_ramp_up', t_current_ramp_up, 0.0D0, 1.0D4, &
'Plasma current ramp-up time for current init (s)')
case ('tohsin')
call parse_real_variable('tohsin', tohsin, 0.0D0, 1.0D4, &
- 'Switch for TOHS calculation')
- case ('tqnch')
- call parse_real_variable('tqnch', tqnch, 0.0D0, 1.0D4, &
+ 'Switch for t_current_ramp_up calculation')
+ case ('t_ramp_down')
+ call parse_real_variable('t_ramp_down', t_ramp_down, 0.0D0, 1.0D4, &
'PF coil shutdown time (s)')
- case ('tramp')
- call parse_real_variable('tramp', tramp, 0.0D0, 1.0D4, &
+ case ('t_precharge')
+ call parse_real_variable('t_precharge', t_precharge, 0.0D0, 1.0D4, &
'Initial charge time for PF coils (s)')
case ('pulsetimings')
call parse_real_variable('pulsetimings', pulsetimings, 0.0D0, 1.0D0, &
diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90
index 83424619..c71baca6 100755
--- a/source/fortran/iteration_variables.f90
+++ b/source/fortran/iteration_variables.f90
@@ -413,25 +413,25 @@ end subroutine set_itv_16
!---------------------------------
subroutine init_itv_17
- !!
(17) tdwell
+ !!
(17) t_between_pulse
use numerics, only: lablxc, boundl, boundu
implicit none
- lablxc(17) = 'tdwell '
+ lablxc(17) = 't_between_pulse '
boundl(17) = 0.100D0
boundu(17) = 1.000D8
end subroutine init_itv_17
real(kind(1.d0)) function itv_17()
- use times_variables, only: tdwell
+ use times_variables, only: t_between_pulse
implicit none
- itv_17 = tdwell
+ itv_17 = t_between_pulse
end function itv_17
subroutine set_itv_17(ratio)
- use times_variables, only: tdwell
+ use times_variables, only: t_between_pulse
implicit none
real(kind(1.d0)) :: ratio
- tdwell = ratio
+ t_between_pulse = ratio
end subroutine set_itv_17
!---------------------------------
@@ -509,25 +509,25 @@ end subroutine set_itv_20
!---------------------------------
subroutine init_itv_21
- !!
(21) ftburn (f-value for equation 13)
+ !!
(21) ft_burn (f-value for equation 13)
use numerics, only: lablxc, boundl, boundu
implicit none
- lablxc(21) = 'ftburn '
+ lablxc(21) = 'ft_burn '
boundl(21) = 0.001D0
boundu(21) = 1.000D0
end subroutine init_itv_21
real(kind(1.d0)) function itv_21()
- use constraint_variables, only: ftburn
+ use constraint_variables, only: ft_burn
implicit none
- itv_21 = ftburn
+ itv_21 = ft_burn
end function itv_21
subroutine set_itv_21(ratio)
- use constraint_variables, only: ftburn
+ use constraint_variables, only: ft_burn
implicit none
real(kind(1.d0)) :: ratio
- ftburn = ratio
+ ft_burn = ratio
end subroutine set_itv_21
!!
(22) NOT USED
@@ -1495,10 +1495,10 @@ end subroutine set_itv_64
!---------------------------------
subroutine init_itv_65
- !!
(65) tohs
+ !!
(65) t_current_ramp_up
use numerics, only: lablxc, boundl, boundu
implicit none
- lablxc(65) = 'tohs '
+ lablxc(65) = 't_current_ramp_up '
boundl(65) = 0.100D0
boundu(65) = 1.000D3
end subroutine init_itv_65
@@ -1506,43 +1506,43 @@ end subroutine init_itv_65
real(kind(1.d0)) function itv_65()
use error_handling, only: report_error
use pulse_variables, only: lpulse
- use times_variables, only: tohs
+ use times_variables, only: t_current_ramp_up
implicit none
- itv_65 = tohs
+ itv_65 = t_current_ramp_up
if (lpulse /= 1) then
call report_error(50)
end if
end function itv_65
subroutine set_itv_65(ratio)
- use times_variables, only: tohs
+ use times_variables, only: t_current_ramp_up
implicit none
real(kind(1.d0)) :: ratio
- tohs = ratio
+ t_current_ramp_up = ratio
end subroutine set_itv_65
!---------------------------------
subroutine init_itv_66
- !!
(66) ftohs (f-value for equation 41)
+ !!
(66) ft_current_ramp_up (f-value for equation 41)
use numerics, only: lablxc, boundl, boundu
implicit none
- lablxc(66) = 'ftohs '
+ lablxc(66) = 'ft_current_ramp_up '
boundl(66) = 0.001D0
boundu(66) = 1.000D0
end subroutine init_itv_66
real(kind(1.d0)) function itv_66()
- use constraint_variables, only: ftohs
+ use constraint_variables, only: ft_current_ramp_up
implicit none
- itv_66 = ftohs
+ itv_66 = ft_current_ramp_up
end function itv_66
subroutine set_itv_66(ratio)
- use constraint_variables, only: ftohs
+ use constraint_variables, only: ft_current_ramp_up
implicit none
real(kind(1.d0)) :: ratio
- ftohs = ratio
+ ft_current_ramp_up = ratio
end subroutine set_itv_66
!---------------------------------
diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90
index ce82d81d..b3fec23b 100755
--- a/source/fortran/numerics.f90
+++ b/source/fortran/numerics.f90
@@ -167,7 +167,7 @@ module numerics
!!
(64) Zeff less than or equal to zeffmax (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(tohs), 115)
+ !! (Use iteration variable 65(t_current_ramp_up), 115)
!!
56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
57 `bt` lower boundary\n
58 `scrapli` : Inboard plasma-first wall gap\n
59 `scraplo` : Outboard plasma-first wall gap\n
60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
61 copperaoh_m2_max : CS coil current / copper area\n
62 coheof : CS coil current density at EOF\n
63 ohcth : CS thickness (m)\n
64 ohhghf : CS height (m)
",
"nsweep_2": "nsweep_2 /3/ : switch denoting quantity to scan for 2D scan:",
"nt": "",
"ntype": "switch for vacuum pump type:\n
\n
=0 - for turbomolecular pump (magnetic bearing) with speed of 2.0 m3/s\n (1.95 for N2, 1.8 for He, 1.8 for DT)
\n
=1 - for compound cryopump with nominal speed of 10.0 m3/s\n (9.0 for N2, 5.0 for He and 25.0 for DT)
\n
",
@@ -10417,7 +10417,7 @@
"ptrepv": "electron transport power per volume (MW/m3)",
"ptrimw": "ion transport power (MW)",
"ptripv": "ion transport power per volume (MW/m3)",
- "pulsetimings": "Switch for pulse timings (if lpulse=1):\n
\n
=0, tohs = Ip(MA)/0.1 tramp, tqnch = input
\n
=1, tohs = iteration var or input. tramp/tqnch max of input or tohs
\n
",
+ "pulsetimings": "Switch for pulse timings (if lpulse=1):\n
=1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up
\n
",
"pumpareafraction": "area of one pumping port as a fraction of plasma surface area",
"pumpspeedfactor": "effective pumping speed reduction factor due to duct impedance",
"pumpspeedmax": "maximum pumping speed per unit area for deuterium & tritium, molecular flow",
@@ -10748,9 +10748,9 @@
"tbr": "tritium breeding ratio (`iblanket=2,3` (KIT HCPB/HCLL))",
"tbratio": "Tritium breeding ratio [--]",
"tbrmin": "minimum tritium breeding ratio (`constraint equation 52`)",
- "tbrnmn": "minimum burn time (s) (KE - no longer itv., see issue #706)",
- "tburn": "burn time (s) (calculated if `lpulse=1`)",
- "tburn0": "burn time (s) - used for internal consistency",
+ "t_burn_min": "minimum burn time (s) (KE - no longer itv., see issue #706)",
+ "t_burn": "burn time (s) (calculated if `lpulse=1`)",
+ "t_burn_0": "burn time (s) - used for internal consistency",
"tcomrepl": "time taken to replace both blanket and divertor (y) (`iavail=1`)",
"tconl": "main plasma connection length (m)",
"tcoolin": "centrepost coolant inlet temperature (K)",
@@ -10758,14 +10758,14 @@
"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`)",
"tdmptf": "fast discharge time for TF coil in event of quench (s) (`iteration variable 56`)\nFor REBCO model, meaning depends on quench_model:\n
\n
exponential quench : e-folding time (s)`
\n
linear quench : discharge time (s)
\n
",
"tdown": "down time (s)",
"tdspmw": "IFE target delivery system power (MW)",
- "tdwell": "time between pulses in a pulsed reactor (s) (`iteration variable 17`)",
+ "t_between_pulse": "time between pulses in a pulsed reactor (s) (`iteration variable 17`)",
"te": "volume averaged electron temperature (keV) (`iteration variable 4`)\n (`calculated if ipedestal=3`)",
"te0": "central electron temperature (keV)",
"te0_ecrh_achievable": "maximal central electron temperature as achievable by the ECRH, input. (keV)",
@@ -10853,9 +10853,9 @@
"tmaxpro": "maximum temp rise during a quench for protection (K)",
"tmpcry": "coil temperature for cryogenic plant power calculation (K)",
"tn": "neutral gas temperature in chamber (K)",
- "tohs": "plasma current ramp-up time for current initiation (s) (calculated if `lpulse=0`)\n (`iteration variable 65`)",
- "tohsin": "Switch for plasma current ramp-up time (if lpulse=0):\n
\n
= 0, tohs = tramp = tqnch = Ip(MA)/0.5
\n
<>0, tohs = tohsin; tramp, tqnch are input
\n
",
- "tohsmn": "minimum plasma current ramp-up time (s) (`constraint equation 41`)",
+ "t_current_ramp_up": "plasma current ramp-up time for current initiation (s) (calculated if `lpulse=0`)\n (`iteration variable 65`)",
+ "tohsin": "Switch for plasma current ramp-up time (if lpulse=0):\n