Exogenously specified state of charge (#1008)

blue-marble · Jul 26, 2023 · 93350a8 · 93350a8
1 parent 3ef83e1
commit 93350a8
Show file tree

Hide file tree

Showing 65 changed files with 1,212 additions and 759 deletions.
diff --git a/db/csvs_test_examples/csv_structure.csv b/db/csvs_test_examples/csv_structure.csv
@@ -26,6 +26,7 @@ project/project_startup_chars,data_dependent,startup_chars_scenario_id,project_s
 project/project_flex_load_static_profiles,data_dependent,flex_load_static_profile_scenario_id,project_flex_load_static_profiles,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_hydro_operational_chars,data_dependent,hydro_operational_chars_scenario_id,project_hydro_operational_chars,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_variable_generator_profiles,data_dependent,variable_generator_profile_scenario_id,project_variable_generator_profiles,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
+project/project_stor_exog_soc,data_dependent,stor_exog_state_of_charge_scenario_id,project_stor_exog_state_of_charge,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_cycle_selection,data_dependent,cycle_selection_scenario_id,project_cycle_selection,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_supplemental_firing,data_dependent,supplemental_firing_scenario_id,project_supplemental_firing,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_cap_factor_limits,data_dependent,cap_factor_limits_scenario_id,project_cap_factor_limits,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id

diff --git a/...roject/project_operational_chars/10_project_operational_chars_2zones_hydro_must_take2.csv b/...roject/project_operational_chars/10_project_operational_chars_2zones_hydro_must_take2.csv
@@ -1,21 +1,21 @@
-project,technology,operational_type,balancing_type_project,variable_om_cost_per_mwh,project_fuel_scenario_id,heat_rate_curves_scenario_id,variable_om_curves_scenario_id,startup_chars_scenario_id,min_stable_level_fraction,unit_size_mw,startup_cost_per_mw,shutdown_cost_per_mw,startup_fuel_mmbtu_per_mw,startup_plus_ramp_up_rate,shutdown_plus_ramp_down_rate,ramp_up_when_on_rate,ramp_down_when_on_rate,ramp_up_violation_penalty,ramp_down_violation_penalty,min_up_time_hours,min_up_time_violation_penalty,min_down_time_hours,min_down_time_violation_penalty,cycle_selection_scenario_id,supplemental_firing_scenario_id,allow_startup_shutdown_power,storage_efficiency,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,soc_penalty_cost_per_energyunit,soc_last_tmp_penalty_cost_per_energyunit,flex_load_static_profile_scenario_id,minimum_duration_hours,maximum_duration_hours,aux_consumption_frac_capacity,aux_consumption_frac_power,last_commitment_stage,variable_generator_profile_scenario_id,curtailment_cost_per_pwh,hydro_operational_chars_scenario_id,lf_reserves_up_derate,lf_reserves_down_derate,regulation_up_derate,regulation_down_derate,frequency_response_derate,spinning_reserves_derate,lf_reserves_up_ramp_rate,lf_reserves_down_ramp_rate,regulation_up_ramp_rate,regulation_down_ramp_rate,frequency_response_ramp_rate,spinning_reserves_ramp_rate,powerunithour_per_fuelunit,cap_factor_limits_scenario_id,partial_availability_threshold
-Nuclear,Nuclear,gen_must_run,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal,Coal,gen_commit_lin,day,1,1,1,,1,0.4,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
-Gas_CCGT,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-Gas_CT,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
-Wind,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-Battery,Storage,stor,day,0,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,1,99,,,,,,,,,,,,,,,,,,,,,
-Hydro,Hydro,gen_hydro_must_take,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,
-Gas_CCGT_new,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-Gas_CT_new,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
-Solar,Solar,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-Nuclear_z2,Nuclear,gen_must_run,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal_z2,Coal,gen_commit_lin,day,1,1,1,,1,0.4,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_z2,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-Gas_CT_z2,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
-Wind_z2,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-Battery_z2,Storage,stor,day,0,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,1,99,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_new_z2,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-Gas_CT_new_z2,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
-Clunky_Old_Gen,Coal,gen_simple,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
-Wind_new,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
+project,technology,operational_type,balancing_type_project,variable_om_cost_per_mwh,project_fuel_scenario_id,heat_rate_curves_scenario_id,variable_om_curves_scenario_id,startup_chars_scenario_id,min_stable_level_fraction,unit_size_mw,startup_cost_per_mw,shutdown_cost_per_mw,startup_fuel_mmbtu_per_mw,startup_plus_ramp_up_rate,shutdown_plus_ramp_down_rate,ramp_up_when_on_rate,ramp_down_when_on_rate,ramp_up_violation_penalty,ramp_down_violation_penalty,min_up_time_hours,min_up_time_violation_penalty,min_down_time_hours,min_down_time_violation_penalty,cycle_selection_scenario_id,supplemental_firing_scenario_id,allow_startup_shutdown_power,storage_efficiency,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,soc_penalty_cost_per_energyunit,soc_last_tmp_penalty_cost_per_energyunit,flex_load_static_profile_scenario_id,minimum_duration_hours,maximum_duration_hours,aux_consumption_frac_capacity,aux_consumption_frac_power,last_commitment_stage,variable_generator_profile_scenario_id,curtailment_cost_per_pwh,hydro_operational_chars_scenario_id,lf_reserves_up_derate,lf_reserves_down_derate,regulation_up_derate,regulation_down_derate,frequency_response_derate,spinning_reserves_derate,lf_reserves_up_ramp_rate,lf_reserves_down_ramp_rate,regulation_up_ramp_rate,regulation_down_ramp_rate,frequency_response_ramp_rate,spinning_reserves_ramp_rate,powerunithour_per_fuelunit,cap_factor_limits_scenario_id,partial_availability_threshold,stor_exog_state_of_charge_scenario_id
+Nuclear,Nuclear,gen_must_run,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Coal,Coal,gen_commit_lin,day,1,1,1,,1,0.4,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,
+Gas_CCGT,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+Gas_CT,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
+Wind,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+Battery,Storage,stor,day,0,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,1,99,,,,,,,,,,,,,,,,,,,,,,
+Hydro,Hydro,gen_hydro_must_take,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,
+Gas_CCGT_new,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+Gas_CT_new,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
+Solar,Solar,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+Nuclear_z2,Nuclear,gen_must_run,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Coal_z2,Coal,gen_commit_lin,day,1,1,1,,1,0.4,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CCGT_z2,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+Gas_CT_z2,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
+Wind_z2,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+Battery_z2,Storage,stor,day,0,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,1,99,,,,,,,,,,,,,,,,,,,,,,
+Gas_CCGT_new_z2,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+Gas_CT_new_z2,Gas,gen_commit_lin,day,2,1,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
+Clunky_Old_Gen,Coal,gen_simple,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,
+Wind_new,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
diff --git a/..._test_examples/project/project_operational_chars/11_project_operational_chars_2zones4.csv b/..._test_examples/project/project_operational_chars/11_project_operational_chars_2zones4.csv
@@ -1,22 +1,22 @@
-project,technology,operational_type,balancing_type_project,variable_om_cost_per_mwh,project_fuel_scenario_id,heat_rate_curves_scenario_id,variable_om_curves_scenario_id,startup_chars_scenario_id,min_stable_level_fraction,unit_size_mw,startup_cost_per_mw,shutdown_cost_per_mw,startup_fuel_mmbtu_per_mw,startup_plus_ramp_up_rate,shutdown_plus_ramp_down_rate,ramp_up_when_on_rate,ramp_down_when_on_rate,ramp_up_violation_penalty,ramp_down_violation_penalty,min_up_time_hours,min_up_time_violation_penalty,min_down_time_hours,min_down_time_violation_penalty,cycle_selection_scenario_id,supplemental_firing_scenario_id,allow_startup_shutdown_power,storage_efficiency,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,soc_penalty_cost_per_energyunit,soc_last_tmp_penalty_cost_per_energyunit,flex_load_static_profile_scenario_id,minimum_duration_hours,maximum_duration_hours,aux_consumption_frac_capacity,aux_consumption_frac_power,last_commitment_stage,variable_generator_profile_scenario_id,curtailment_cost_per_pwh,hydro_operational_chars_scenario_id,lf_reserves_up_derate,lf_reserves_down_derate,regulation_up_derate,regulation_down_derate,frequency_response_derate,spinning_reserves_derate,lf_reserves_up_ramp_rate,lf_reserves_down_ramp_rate,regulation_up_ramp_rate,regulation_down_ramp_rate,frequency_response_ramp_rate,spinning_reserves_ramp_rate,powerunithour_per_fuelunit,cap_factor_limits_scenario_id,partial_availability_threshold
-Nuclear,Nuclear,gen_must_run,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal,Coal,gen_commit_cap,day,1,1,1,,,0.4,6,1,0,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
-Gas_CCGT,Gas,gen_commit_bin,day,2,1,1,,2,0.4,,,2,,,0.012,,,,,,,6,,,,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-Gas_CT,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
-Wind,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-Battery,Storage,stor,day,0,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,1,99,,,,,,,,,,,,,,,,,,,,,
-Hydro,Hydro,gen_hydro,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CCGT_new,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-Gas_CT_new,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
-Solar,Solar,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-Nuclear_z2,Nuclear,gen_must_run,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal_z2,Coal,gen_commit_cap,day,1,1,1,,,0.4,6,1,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_z2,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-Gas_CT_z2,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
-Wind_z2,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-Battery_z2,Storage,stor,day,0,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,1,99,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_new_z2,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-Gas_CT_new_z2,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,
-Clunky_Old_Gen,Coal,gen_simple,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,
-Wind_new,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
-Gas_CCGT_z3,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+project,technology,operational_type,balancing_type_project,variable_om_cost_per_mwh,project_fuel_scenario_id,heat_rate_curves_scenario_id,variable_om_curves_scenario_id,startup_chars_scenario_id,min_stable_level_fraction,unit_size_mw,startup_cost_per_mw,shutdown_cost_per_mw,startup_fuel_mmbtu_per_mw,startup_plus_ramp_up_rate,shutdown_plus_ramp_down_rate,ramp_up_when_on_rate,ramp_down_when_on_rate,ramp_up_violation_penalty,ramp_down_violation_penalty,min_up_time_hours,min_up_time_violation_penalty,min_down_time_hours,min_down_time_violation_penalty,cycle_selection_scenario_id,supplemental_firing_scenario_id,allow_startup_shutdown_power,storage_efficiency,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,soc_penalty_cost_per_energyunit,soc_last_tmp_penalty_cost_per_energyunit,flex_load_static_profile_scenario_id,minimum_duration_hours,maximum_duration_hours,aux_consumption_frac_capacity,aux_consumption_frac_power,last_commitment_stage,variable_generator_profile_scenario_id,curtailment_cost_per_pwh,hydro_operational_chars_scenario_id,lf_reserves_up_derate,lf_reserves_down_derate,regulation_up_derate,regulation_down_derate,frequency_response_derate,spinning_reserves_derate,lf_reserves_up_ramp_rate,lf_reserves_down_ramp_rate,regulation_up_ramp_rate,regulation_down_ramp_rate,frequency_response_ramp_rate,spinning_reserves_ramp_rate,powerunithour_per_fuelunit,cap_factor_limits_scenario_id,partial_availability_threshold,stor_exog_state_of_charge_scenario_id
+Nuclear,Nuclear,gen_must_run,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Coal,Coal,gen_commit_cap,day,1,1,1,,,0.4,6,1,0,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,
+Gas_CCGT,Gas,gen_commit_bin,day,2,1,1,,2,0.4,,,2,,,0.012,,,,,,,6,,,,1,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+Gas_CT,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
+Wind,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+Battery,Storage,stor,day,0,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,1,99,,,,,,,,,,,,,,,,,,,,,,
+Hydro,Hydro,gen_hydro,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,
+Gas_CCGT_new,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+Gas_CT_new,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
+Solar,Solar,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+Nuclear_z2,Nuclear,gen_must_run,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Coal_z2,Coal,gen_commit_cap,day,1,1,1,,,0.4,6,1,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CCGT_z2,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+Gas_CT_z2,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
+Wind_z2,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+Battery_z2,Storage,stor,day,0,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,1,99,,,,,,,,,,,,,,,,,,,,,,
+Gas_CCGT_new_z2,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+Gas_CT_new_z2,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,
+Clunky_Old_Gen,Coal,gen_simple,day,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,
+Wind_new,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
+Gas_CCGT_z3,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,