diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index ac73645d..fcb4be85 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -557,12 +557,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8401E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.8571E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 index b27363af..d8b092c5 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 index 422e223a..0fa5b5e1 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 index 53207efe..29929a8f 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 index c2cb109c..007c4856 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 index d686f0f0..d0ef78e3 100644 --- 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 * *---------------* diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 85850a9f..7af258db 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -410,12 +410,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -872,8 +872,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +1405,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -1867,8 +1867,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +2400,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -2862,8 +2862,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +3395,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -3857,8 +3857,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +4390,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -4852,8 +4852,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +5385,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -5847,8 +5847,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +6380,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -6842,8 +6842,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +7375,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -7837,8 +7837,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +8370,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -8832,8 +8832,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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 @@ -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..bcbaf7a5 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_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 * *---------------* diff --git a/process/availability.py b/process/availability.py index d7218b8e..a3807a3f 100644 --- a/process/availability.py +++ b/process/availability.py @@ -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.tcycle) # 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.tcycle) # Output if output: @@ -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.tcycle) if output: if tfv.i_tf_sup == 1: diff --git a/process/costs.py b/process/costs.py index 13ef0d2a..cc57ab91 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2590,7 +2590,7 @@ def coelc(self): * heat_transport_variables.pnetelmw * (24.0e0 * constants.n_day_year) * cost_variables.cfactr - * times_variables.tburn + * times_variables.t_burn / times_variables.tcycle ) 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/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/variable_metadata.py b/process/io/variable_metadata.py index a5aded41..c67a17ce 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( diff --git a/process/pfcoil.py b/process/pfcoil.py index c52299e1..9dbb63b1 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)) ) @@ -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..d2044605 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.tburn0). # 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.tburn0 = 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_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,16 +3125,19 @@ 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( 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..c170a277 100755 --- a/process/pulse.py +++ b/process/pulse.py @@ -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..b9440dbd 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -905,10 +905,10 @@ subroutine constraint_eqn_013(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. !! ftburn : input real : f-value for minimum burn time - !! tburn : input real : burn time (s) (calculated if lpulse=1) + !! t_burn : 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 + 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_cc = 1.0D0 - ftburn * t_burn/tbrnmn tmp_con = tbrnmn / ftburn - tmp_err = tbrnmn / ftburn - tburn + tmp_err = tbrnmn / ftburn - t_burn tmp_symbol = '>' tmp_units = 'sec' @@ -1821,10 +1821,10 @@ subroutine constraint_eqn_041(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. !! ftohs : input real : f-value for plasma current ramp-up time - !! tohs : input real : plasma current ramp-up time for current initiation (s) + !! t_current_ramp_up : 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 + use times_variables, only: t_current_ramp_up implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1832,7 +1832,7 @@ 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_cc = 1.0D0 - ftohs * t_current_ramp_up/tohsmn tmp_con = tohsmn * (1.0D0 - tmp_cc) tmp_err = tohsmn * tmp_cc tmp_symbol = '>' 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..abf8bdaa 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -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 @@ -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..91017989 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 !--------------------------------- @@ -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,19 +1506,19 @@ 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 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index ce82d81d..e23d5580 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) !!
  • (67) Simple Radiation Wall load limit (itv 116, 4,6) !!
  • (68) Psep * Bt / qAR upper limit (itv 117) !!
  • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118) @@ -218,7 +218,7 @@ module numerics !!
  • (14) fwalld (f-value for equation 8) !!
  • (15) fvs (f-value for equation 12) !!
  • (16) ohcth - !!
  • (17) tdwell + !!
  • (17) t_between_pulse !!
  • (18) q !!
  • (19) beam_energy !!
  • (20) tcpav @@ -266,7 +266,7 @@ module numerics !!
  • (62) fdtmp (f-value for equation 38) !!
  • (63) ftpeak (f-value for equation 39) !!
  • (64) fauxmn (f-value for equation 40) - !!
  • (65) tohs + !!
  • (65) t_current_ramp_up !!
  • (66) ftohs (f-value for equation 41) !!
  • (67) ftcycl (f-value for equation 42) !!
  • (68) fptemp (f-value for equation 44) diff --git a/source/fortran/stellarator.f90 b/source/fortran/stellarator.f90 index c3e37d1e..bb6ee671 100644 --- a/source/fortran/stellarator.f90 +++ b/source/fortran/stellarator.f90 @@ -59,8 +59,8 @@ subroutine stinit use numerics, only: boundl, boundu use stellarator_variables, only: istell use tfcoil_variables, only: n_tf - use times_variables, only: tburn, tcycle, tdown, tdwell, t_fusion_ramp, tohs, & - tpulse, tqnch, tramp + use times_variables, only: t_burn, tcycle, tdown, t_between_pulse, t_fusion_ramp, t_current_ramp_up, & + t_pulse_repetition, t_ramp_down, t_precharge use global_variables, only: icase use constants, only: pi, rmu0, nout implicit none @@ -109,13 +109,13 @@ subroutine stinit ! Times for different phases - tramp = 0.0D0 - tohs = 0.0D0 - tburn = 3.15576D7 ! one year - tqnch = 0.0D0 - tpulse = tohs + t_fusion_ramp + tburn + tqnch - tdown = tramp + tohs + tqnch + tdwell - tcycle = tramp + tohs + t_fusion_ramp + tburn + tqnch + tdwell + t_precharge = 0.0D0 + t_current_ramp_up = 0.0D0 + t_burn = 3.15576D7 ! one year + t_ramp_down = 0.0D0 + t_pulse_repetition = t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down + tdown = t_precharge + t_current_ramp_up + t_ramp_down + t_between_pulse + tcycle = t_precharge + t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down + t_between_pulse end subroutine stinit end module stellarator_module diff --git a/source/fortran/times_variables.f90 b/source/fortran/times_variables.f90 index d08c094f..81ecd6f0 100644 --- a/source/fortran/times_variables.f90 +++ b/source/fortran/times_variables.f90 @@ -17,11 +17,11 @@ module times_variables real(dp) :: pulsetimings !! Switch for pulse timings (if lpulse=1): !! - !! - =0, tohs = Ip(MA)/0.1 tramp, tqnch = input - !! - =1, tohs = iteration var or input. tramp/tqnch max of input or tohs + !! - =0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input + !! - =1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up - real(dp) :: tburn - !! burn time (s) (calculated if `lpulse=1`) + real(dp) :: t_burn + !! flat-top duration (s) (calculated if `lpulse=1`) real(dp) :: tburn0 !! burn time (s) - used for internal consistency @@ -32,11 +32,11 @@ module times_variables real(dp) :: tdown !! down time (s) - real(dp) :: tdwell + real(dp) :: t_between_pulse !! time between pulses in a pulsed reactor (s) (`iteration variable 17`) real(dp) :: t_fusion_ramp - !! heating time, after current ramp up (s) + !! time for plasma temperature and density rise to full values (s) real(dp), dimension(6) :: tim !! array of time points during plasma pulse (s) @@ -44,27 +44,28 @@ module times_variables character*11, dimension(6) :: timelabel !! array of time labels during plasma pulse (s) - character*11, dimension(5) :: intervallabel + character*19, dimension(5) :: intervallabel !! time intervals - as strings (s) - real(dp) :: tohs - !! plasma current ramp-up time for current initiation (s) (calculated if `lpulse=0`) + real(dp) :: t_current_ramp_up + !! the plasma current ramps up to approx. full value (s) (calculated if `lpulse=0`) !! (`iteration variable 65`) real(dp) :: tohsin !! Switch for plasma current ramp-up time (if lpulse=0): !! - !! - = 0, tohs = tramp = tqnch = Ip(MA)/0.5 - !! - <>0, tohs = tohsin; tramp, tqnch are input + !! - = 0, t_current_ramp_up = t_precharge = t_ramp_down = Ip(MA)/0.5 + !! - <>0, t_current_ramp_up = tohsin; t_precharge, t_ramp_down are input - real(dp) :: tpulse - !! pulse length = tohs + t_fusion_ramp + tburn + tqnch + real(dp) :: t_pulse_repetition + !! pulse length = t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down - real(dp) :: tqnch - !! shut down time for PF coils (s); if pulsed, = tohs + real(dp) :: t_ramp_down + !! time for plasma current, density, and temperature to ramp down to zero, simultaneously (s); if pulsed, = t_current_ramp_up + !! the CS and PF coil currents also ramp to zero at the same time - real(dp) :: tramp - !! initial PF coil charge time (s); if pulsed, = tohs + real(dp) :: t_precharge + !! the time for the central solenoid and PF coils to ramp from zero to max current (s); if pulsed, = t_current_ramp_up contains @@ -73,11 +74,11 @@ subroutine init_times_variables implicit none pulsetimings = 1.0D0 - tburn = 1000.0D0 + t_burn = 1000.0D0 tburn0 = 0.0D0 tcycle = 0.0D0 tdown = 0.0D0 - tdwell = 1800.0D0 + t_between_pulse = 1800.0D0 t_fusion_ramp = 10.0D0 tim = 0.0D0 timelabel = (/ 'Start', & @@ -86,15 +87,15 @@ subroutine init_times_variables 'BOF ', & 'EOF ', & 'EOP ' /) - intervallabel = (/ 'tramp ', & - 'tohs ', & - 't_fusion_ramp', & - 'tburn ', & - 'tqnch ' /) - tohs = 30.0D0 + intervallabel = (/ 't_precharge ', & + 't_current_ramp_up ', & + 't_fusion_ramp ', & + 't_burn ', & + 't_ramp_down ' /) + t_current_ramp_up = 30.0D0 tohsin = 0.0D0 - tpulse = 0.0D0 - tqnch = 15.0D0 - tramp = 15.0D0 + t_pulse_repetition = 0.0D0 + t_ramp_down = 15.0D0 + t_precharge = 15.0D0 end subroutine init_times_variables end module times_variables diff --git a/source/fortran/vacuum_variables.f90 b/source/fortran/vacuum_variables.f90 index 7b017e5a..8c2e47d2 100644 --- a/source/fortran/vacuum_variables.f90 +++ b/source/fortran/vacuum_variables.f90 @@ -65,9 +65,9 @@ module vacuum_variables integer :: dwell_pump !! switch for dwell pumping options: !! - !! - =0 pumping only during tdwell - !! - =1 pumping only during tramp - !! - =2 pumping during tdwell + tramp + !! - =0 pumping only during t_between_pulse + !! - =1 pumping only during t_precharge + !! - =2 pumping during t_between_pulse + t_precharge ! The following are used in the Battes, Day and Rohde pump-down model ! See "Basic considerations on the pump-down time in the dwell phase of a pulsed fusion DEMO" diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 490056a5..74583d1c 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -554,12 +554,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 @@ -1042,8 +1042,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6698E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6698E-03 Allowable_pumping_time_switch___________________________________________ (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 @@ -1630,13 +1630,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/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index de5ea33c..3532ff68 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 7cbd8d7d..9dc6fc49 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 0696cb91..d9bb692e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -555,12 +555,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index d686f0f0..d0ef78e3 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/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 * *---------------* diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 340bfe15..a2ebd894 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -552,12 +552,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8516E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.6494E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6521E+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.6521E+02 Heating_time_(s)________________________________________________________ (t_fusion_ramp)_______________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.1971E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6521E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.1971E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6521E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8377E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -1046,8 +1046,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6587E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6587E-03 Allowable_pumping_time_switch___________________________________________ (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.7143E+01 OP @@ -1632,13 +1632,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/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 3d379dcd..f7be20ec 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -430,8 +430,8 @@ vftf = 0.3 * coolant fraction of TFC 'cable' (`i_tf_sup=1`); or of TFC leg ( *-----------------Times Variables------------------* pulsetimings = 0 * Switch for pulse timings (if lpulse=1); -tdwell = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) -tramp = 500.0 * initial PF coil charge time (s); if pulsed; = tohs +t_between_pulse = 1800.0 * time between pulses in a pulsed reactor (s) (`iteration variable 17`) +t_precharge = 500.0 * initial PF coil charge time (s); if pulsed; = t_current_ramp_up *--------------------Utilities---------------------* diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index a6c75e36..abb4d47e 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -293,9 +293,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-----------------* @@ -330,8 +330,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/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 3c952ebb..09d5109f 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -556,12 +556,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8403E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9617E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6569E+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.6569E+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.6569E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6569E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 9.8415E+03 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -1044,8 +1044,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6636E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6636E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.4806E+01 OP @@ -1719,12 +1719,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8362E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0338E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6633E+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.6633E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.4937E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6633E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.4937E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6633E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0137E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -2207,8 +2207,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6700E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6700E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5734E+01 OP @@ -2882,12 +2882,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8300E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0929E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6683E+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.6683E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.6787E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6683E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6787E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6683E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0323E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -3370,8 +3370,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6750E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6750E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5987E+01 OP @@ -4045,12 +4045,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8204E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0982E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6609E+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.6609E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.7431E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6609E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7431E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6609E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0386E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -4533,8 +4533,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6676E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6676E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5523E+01 OP @@ -5208,12 +5208,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8323E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0430E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6604E+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.6604E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.5979E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6604E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5979E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6604E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0240E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -5696,8 +5696,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6671E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6671E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5947E+01 OP @@ -6371,12 +6371,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8374E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9690E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6548E+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.6548E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.4808E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6548E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.4808E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6548E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0122E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -6859,8 +6859,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6614E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6614E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.6324E+01 OP @@ -7534,12 +7534,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8284E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9732E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6479E+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.6479E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.5384E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6479E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5384E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6479E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0178E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -8022,8 +8022,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6546E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6546E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5904E+01 OP @@ -8697,12 +8697,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8182E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0426E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6497E+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.6497E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.6518E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6497E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6518E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6497E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0292E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -9185,8 +9185,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6563E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6563E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5984E+01 OP @@ -9860,12 +9860,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8018E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1131E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6468E+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.6468E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.7587E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6468E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7587E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6468E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0398E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -10348,8 +10348,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6534E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6534E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5778E+01 OP @@ -11023,12 +11023,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.7989E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1157E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6447E+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.6447E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.7976E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6447E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7976E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6447E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0437E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -11511,8 +11511,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6513E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6513E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5487E+01 OP @@ -12186,12 +12186,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8184E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0431E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6498E+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.6498E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.6748E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6498E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6748E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6498E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0315E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -12674,8 +12674,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6564E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6564E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5760E+01 OP @@ -13349,12 +13349,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8291E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9741E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6485E+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.6485E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.5501E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6485E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5501E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6485E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0190E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -13837,8 +13837,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6551E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6551E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5859E+01 OP @@ -14512,12 +14512,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8251E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9768E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6455E+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.6455E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.5927E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6455E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.5927E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6455E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0232E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -15000,8 +15000,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6521E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6521E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5541E+01 OP @@ -15675,12 +15675,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8208E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0430E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6516E+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.6516E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.6632E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6516E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.6632E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6516E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0304E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -16163,8 +16163,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6583E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6583E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5579E+01 OP @@ -16838,12 +16838,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8166E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1092E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (tramp)_______________________ 5.0000E+02 - Plasma_current_ramp-up_time_(s)_________________________________________ (tohs)________________________ 1.6581E+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.6581E+02 Heating_time_(s)________________________________________________________ (theat)_______________________ 1.0000E+01 - Burn_time_(s)___________________________________________________________ (tburn)_______________________ 7.7318E+03 OP - Reset_time_to_zero_current_for_CS_(s)___________________________________ (tqnch)_______________________ 1.6581E+02 - Time_between_pulses_(s)_________________________________________________ (tdwell)______________________ 1.8000E+03 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.7318E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.6581E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 1.0374E+04 OP # Radial Build # TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 @@ -17326,8 +17326,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.6648E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.6648E-03 Allowable_pumping_time_switch___________________________________________ (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))_____________________ 6.5622E+01 OP @@ -17917,13 +17917,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/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 0bf34c26..e41c18ae 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -410,12 +410,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -872,8 +872,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +1405,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -1867,8 +1867,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +2400,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -2862,8 +2862,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +3395,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -3857,8 +3857,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +4390,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -4852,8 +4852,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +5385,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -5847,8 +5847,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +6380,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -6842,8 +6842,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +7375,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -7837,8 +7837,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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,12 +8370,12 @@ Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # - Initial_charge_time_for_CS_from_zero_current_(s)________________________ (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 + Burn_time_(s)___________________________________________________________ (t_burn)_______________________ 7.2000E+03 OP + Reset_time_to_zero_current_for_CS_(s)___________________________________ (t_ramp_down)_______________________ 1.8078E+02 + Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 0.0000E+00 Total_plant_cycle_time_(s)______________________________________________ (tcycle)______________________ 8.0716E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # @@ -8832,8 +8832,8 @@ Chamber_pressure_after_burn_(Pa)________________________________________ (pend)________________________ 1.4725E-01 OP Chamber_pressure_before_burn_(Pa)_______________________________________ (pstart)______________________ 1.4725E-03 Allowable_pumping_time_switch___________________________________________ (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 @@ -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/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 346e31e0..eec25c21 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -293,9 +293,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-----------------* @@ -330,8 +330,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/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 6acaad0d..89b7f74b 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -293,9 +293,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-----------------* @@ -330,8 +330,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/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f01dc0c3..6492263c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2615,11 +2615,11 @@ "int_def": "selected_int_kind(9)", "int_long": "selected_int_kind(18)", "intervallabel": [ - "tramp", - "tohs", + "t_precharge", + "t_current_ramp_up", "t_fusion_ramp", - "tburn", - "tqnch" + "t_burn", + "t_ramp_down" ], "inuclear": 0.0, "inx": null, @@ -7491,7 +7491,7 @@ "tbratio": 0.0, "tbrmin": 1.1, "tbrnmn": 1.0, - "tburn": 1000.0, + "t_burn": 1000.0, "tburn0": 0.0, "tcomrepl": 0.5, "tconl": 0.0, @@ -7507,7 +7507,7 @@ "tdmptf": 10.0, "tdown": 0.0, "tdspmw": 0.01, - "tdwell": 1800.0, + "t_between_pulse": 1800.0, "te": 12.9, "te0": 0.0, "te0_ecrh_achievable": null, @@ -7619,7 +7619,7 @@ "tmaxpro": 150.0, "tmpcry": 4.5, "tn": 300.0, - "tohs": 30.0, + "t_current_ramp_up": 30.0, "tohsin": 0.0, "tohsmn": 1.0, "tok_build_cost_per_vol": 1283.0, @@ -7634,9 +7634,9 @@ "tpeak": 873.0, "tpeakfwi": 0.0, "tpeakfwo": 0.0, - "tpulse": 0.0, - "tqnch": 15.0, - "tramp": 15.0, + "t_pulse_repetition": 0.0, + "t_ramp_down": 15.0, + "t_precharge": 15.0, "transp_clrnc": 1.0, "tratio": 1.0, "trcl": 1.0, @@ -9368,7 +9368,7 @@ "dtiocool": "inlet / outlet TF coil coolant temperature rise (K)", "dtlife": "period prior to the end of the plant life that the decommissioning fund is used (years)", "dtstor": "maximum allowable temperature change in stainless steel thermal storage block (K) (`istore=3`)", - "dwell_pump": "switch for dwell pumping options:\n", + "dwell_pump": "switch for dwell pumping options:\n", "dztop": "centrepost taper height adjustment (m)", "e_": "", "e_Li": "Lithium 6 enrichment [%]", @@ -9961,9 +9961,9 @@ "ki": "", "kron": "", "ksic": "power fraction for outboard double-null scrape-off plasma", - "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)\n\n\n\n", + "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)\n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables