Updated time variable names

ukaea · Nov 27, 2024 · 305bae7 · 305bae7
1 parent 73d1488
commit 305bae7
Show file tree

Hide file tree

Showing 56 changed files with 707 additions and 661 deletions.
diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT
@@ -557,12 +557,12 @@
  Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________      2.8401E+02    
  Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________      2.8571E+02    
  # Times #
- Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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    
+ Burn_time_(s)___________________________________________________________ (t_burn)_______________________      7.1999E+03 OP 
+ Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________      1.6699E+02    
+ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________      1.8000E+03    
  Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________      9.8441E+03 OP 
  kallenbach_switch_______________________________________________________ (kallenbach_switch)___________              0    
  # Radial Build #
@@ -1048,8 +1048,8 @@
  Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________      1.6766E-01 OP 
  Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________      1.6766E-03    
  Allowable_pumping_time_switch___________________________________________ (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 
@@ -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
@@ -555,12 +555,12 @@
  Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________      2.8601E+02    
  Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________      2.7014E+02    
  # Times #
- Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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    
+ Burn_time_(s)___________________________________________________________ (t_burn)_______________________      7.2035E+03 OP 
+ Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________      1.6631E+02    
+ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________      1.8000E+03    
  Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________      9.8463E+03 OP 
  # Radial Build #
  TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________              0    
@@ -1043,8 +1043,8 @@
  Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________      1.6698E-01 OP 
  Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________      1.6698E-03    
  Allowable_pumping_time_switch___________________________________________ (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 
@@ -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
@@ -555,12 +555,12 @@
  Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________      2.8601E+02    
  Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________      2.7014E+02    
  # Times #
- Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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    
+ Burn_time_(s)___________________________________________________________ (t_burn)_______________________      7.2035E+03 OP 
+ Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________      1.6631E+02    
+ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________      1.8000E+03    
  Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________      9.8463E+03 OP 
  # Radial Build #
  TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________              0    
@@ -1043,8 +1043,8 @@
  Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________      1.6698E-01 OP 
  Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________      1.6698E-03    
  Allowable_pumping_time_switch___________________________________________ (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 
@@ -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
@@ -555,12 +555,12 @@
  Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________      2.8601E+02    
  Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________      2.7014E+02    
  # Times #
- Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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    
+ Burn_time_(s)___________________________________________________________ (t_burn)_______________________      7.2035E+03 OP 
+ Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________      1.6631E+02    
+ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________      1.8000E+03    
  Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________      9.8463E+03 OP 
  # Radial Build #
  TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________              0    
@@ -1043,8 +1043,8 @@
  Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________      1.6698E-01 OP 
  Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________      1.6698E-03    
  Allowable_pumping_time_switch___________________________________________ (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 
@@ -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
@@ -555,12 +555,12 @@
  Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________      2.8601E+02    
  Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________      2.7014E+02    
  # Times #
- Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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    
+ Burn_time_(s)___________________________________________________________ (t_burn)_______________________      7.2035E+03 OP 
+ Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________      1.6631E+02    
+ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________      1.8000E+03    
  Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________      9.8463E+03 OP 
  # Radial Build #
  TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________              0    
@@ -1043,8 +1043,8 @@
  Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________      1.6698E-01 OP 
  Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________      1.6698E-03    
  Allowable_pumping_time_switch___________________________________________ (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 
@@ -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
@@ -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 *
 *---------------*