Support for mapping operating characteristics to timepoints and horizons

data_toolkit/project/opchar/eia860_to_project_opchar_input_csvs.py

@@ -299,6 +299,7 @@ def make_opchar_sql_str(
     variable_om_cost_per_mwh="NULL",
     variable_om_cost_by_period_scenario_id="NULL",
     variable_om_cost_by_timepoint_scenario_id="NULL",
+    variable_om_cost_by_timepoint_tmp_map_scenario_id="NULL",
     project_fuel_scenario_id="NULL",
     heat_rate_curves_scenario_id="NULL",
     variable_om_curves_scenario_id="NULL",
@@ -344,12 +345,17 @@ def make_opchar_sql_str(
     last_commitment_stage="NULL",
     n_startup_limit_scenario_id="NULL",
     variable_generator_profile_scenario_id="NULL",
+    variable_generator_profile_tmp_map_scenario_id="NULL",
     cap_factor_default="NULL",
     curtailment_cost_scenario_id="NULL",
     hydro_operational_chars_scenario_id="NULL",
+    hydro_operational_chars_hrz_map_scenario_id="NULL",
     energy_profile_scenario_id="NULL",
+    energy_profile_tmp_map_scenario_id="NULL",
     energy_hrz_shaping_scenario_id="NULL",
+    energy_hrz_shaping_hrz_map_scenario_id="NULL",
     energy_slice_hrz_shaping_scenario_id="NULL",
+    energy_slice_hrz_shaping_hrz_map_scenario_id="NULL",
     base_net_requirement_scenario_id="NULL",
     peak_deviation_demand_charge_scenario_id="NULL",
     lf_reserves_up_derate="NULL",
@@ -370,12 +376,15 @@ def make_opchar_sql_str(
     cap_factor_limits_scenario_id="NULL",
     partial_availability_threshold="NULL",
     stor_exog_state_of_charge_scenario_id="NULL",
+    stor_exog_state_of_charge_tmp_map_scenario_id="NULL",
     nonfuel_carbon_emissions_per_mwh="NULL",
     powerhouse="NULL",
     generator_efficiency="NULL",
     linked_load_component="NULL",
     load_modifier_profile_scenario_id="NULL",
+    load_modifier_profile_tmp_map_scenario_id="NULL",
     load_component_shift_bounds_scenario_id="NULL",
+    load_component_shift_bounds_hrz_map_scenario_id="NULL",
     efficiency_factor="NULL",
     energy_requirement_factor="NULL",
     losses_factor_in_energy_target="NULL",
@@ -394,6 +403,7 @@ def make_opchar_sql_str(
      {variable_om_cost_by_period_scenario_id} AS variable_om_cost_by_period_scenario_id,
      {variable_om_cost_by_timepoint_scenario_id} AS 
      variable_om_cost_by_timepoint_scenario_id,	
+     {variable_om_cost_by_timepoint_tmp_map_scenario_id} AS variable_om_cost_by_timepoint_tmp_map_scenario_id,
      {project_fuel_scenario_id} AS project_fuel_scenario_id,
      {heat_rate_curves_scenario_id} AS heat_rate_curves_scenario_id,	
      {variable_om_curves_scenario_id} AS variable_om_curves_scenario_id,
@@ -444,13 +454,18 @@ def make_opchar_sql_str(
      {last_commitment_stage} AS last_commitment_stage,
      {n_startup_limit_scenario_id} AS n_startup_limit_scenario_id,
      {variable_generator_profile_scenario_id} AS variable_generator_profile_scenario_id,
+     {variable_generator_profile_tmp_map_scenario_id} AS variable_generator_profile_tmp_map_scenario_id,
      {cap_factor_default} AS cap_factor_default,
      {curtailment_cost_scenario_id} AS curtailment_cost_scenario_id,	
      {hydro_operational_chars_scenario_id} AS hydro_operational_chars_scenario_id,
+     {hydro_operational_chars_hrz_map_scenario_id} AS hydro_operational_chars_hrz_map_scenario_id,
      {energy_profile_scenario_id} AS "energy_profile_scenario_id",
+     {energy_profile_tmp_map_scenario_id} AS energy_profile_tmp_map_scenario_id,
      {energy_hrz_shaping_scenario_id} AS "energy_hrz_shaping_scenario_id",
+     {energy_hrz_shaping_hrz_map_scenario_id} AS energy_hrz_shaping_hrz_map_scenario_id,
      {energy_slice_hrz_shaping_scenario_id} AS 
      "energy_slice_hrz_shaping_scenario_id",
+     {energy_slice_hrz_shaping_hrz_map_scenario_id} AS energy_slice_hrz_shaping_hrz_map_scenario_id,
      {base_net_requirement_scenario_id} AS "base_net_requirement_scenario_id",
      {peak_deviation_demand_charge_scenario_id} AS 
      "peak_deviation_demand_charge_scenario_id",
@@ -472,13 +487,16 @@ def make_opchar_sql_str(
      {cap_factor_limits_scenario_id} AS cap_factor_limits_scenario_id,
      {partial_availability_threshold} AS partial_availability_threshold,
      {stor_exog_state_of_charge_scenario_id} AS stor_exog_state_of_charge_scenario_id,
+     {stor_exog_state_of_charge_tmp_map_scenario_id} AS stor_exog_state_of_charge_tmp_map_scenario_id,
      {nonfuel_carbon_emissions_per_mwh} AS nonfuel_carbon_emissions_per_mwh,
      {powerhouse} AS powerhouse,
      {generator_efficiency} AS generator_efficiency,
      {linked_load_component} AS linked_load_component,
      {load_modifier_profile_scenario_id} AS load_modifier_profile_scenario_id,
+     {load_modifier_profile_tmp_map_scenario_id} AS load_modifier_profile_tmp_map_scenario_id,
      {load_component_shift_bounds_scenario_id} AS 
      load_component_shift_bounds_scenario_id,
+     {load_component_shift_bounds_hrz_map_scenario_id} AS load_component_shift_bounds_hrz_map_scenario_id,
      {efficiency_factor} AS efficiency_factor,
      {energy_requirement_factor} AS energy_requirement_factor,
      {losses_factor_in_energy_target} AS losses_factor_in_energy_target,

db/csvs_test_examples/csv_structure.csv

@@ -64,6 +64,8 @@ project/opchar/load_component_shift_bounds/iterations,data_dependent,load_compon
 project/opchar/ramp_up_monthly_adjustment,data_dependent,ramp_up_when_on_rate_monthly_adjustment_scenario_id,project_ramp_up_when_on_rate_monthly_adjustments,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/opchar/ramp_down_monthly_adjustment,data_dependent,ramp_down_when_on_rate_monthly_adjustment_scenario_id,project_ramp_down_when_on_rate_monthly_adjustments,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/opchar/startup_limits,data_dependent,n_startup_limit_scenario_id,project_n_startup_limits,simple,,1,project,,ignore,inputs_project_operational_chars,project_operational_chars_scenario_id
+project/opchar/timepoint_maps,data_dependent,opchar_timepoint_map_scenario_id,project_opchar_timepoint_map,simple,,0,,,,,
+project/opchar/horizon_maps,data_dependent,opchar_horizon_map_scenario_id,project_opchar_horizon_map,simple,,0,,,,,
 project/opchar,core,project_operational_chars_scenario_id,project_operational_chars,simple,,0,,,,,
 ,data_dependent,supply_curve_scenario_id,project_shiftable_load_supply_curve,simple,,0,,,,,
 project/availability,data_dependent,project_availability_scenario_id,project_availability,simple,,0,,,,,

db/csvs_test_examples/project/opchar/10_project_operational_chars_2zones_hydro_must_take2.csv

@@ -1,21 +1,21 @@
-project,technology,operational_type,balancing_type_project,load_modifier_flag,distribution_loss_adjustment_factor,variable_om_cost_per_mwh,variable_om_cost_by_period_scenario_id,variable_om_cost_by_timepoint_scenario_id,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_up_when_on_rate_monthly_adjustment_scenario_id,ramp_down_when_on_rate,ramp_down_when_on_rate_monthly_adjustment_scenario_id,ramp_up_violation_penalty,ramp_down_violation_penalty,bt_hrz_ramp_up_rate_limit_scenario_id,bt_hrz_ramp_down_rate_limit_scenario_id,total_ramp_up_limit_scenario_id,total_ramp_down_limit_scenario_id,ramp_tuning_cost_per_mw,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,max_losses_in_hrz_frac_stor_energy_capacity,flex_load_static_profile_scenario_id,minimum_duration_hours,maximum_duration_hours,aux_consumption_frac_capacity,aux_consumption_frac_power,last_commitment_stage,n_startup_limit_scenario_id,variable_generator_profile_scenario_id,cap_factor_default,curtailment_cost_scenario_id,hydro_operational_chars_scenario_id,energy_profile_scenario_id,energy_hrz_shaping_scenario_id,energy_slice_hrz_shaping_scenario_id,base_net_requirement_scenario_id,peak_deviation_demand_charge_scenario_id,lf_reserves_up_derate,lf_reserves_down_derate,regulation_up_derate,regulation_down_derate,frequency_response_derate,spinning_reserves_derate,inertia_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,inertia_constant_sec,powerunithour_per_fuelunit,cap_factor_limits_scenario_id,partial_availability_threshold,stor_exog_state_of_charge_scenario_id,nonfuel_carbon_emissions_per_mwh,powerhouse,generator_efficiency,linked_load_component,load_modifier_profile_scenario_id,load_component_shift_bounds_scenario_id,efficiency_factor,energy_requirement_factor,losses_factor_in_energy_target,losses_factor_curtailment,upward_reserves_to_soc_depletion
-Nuclear,Nuclear,gen_must_run,day,0,0,1,,,1.0,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal,Coal,gen_commit_lin,day,0,0,1,,,1.0,1.0,,1.0,0.4,,,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT,Gas,gen_commit_lin,day,0,0,2,,,1.0,1.0,,1.0,0.4,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CT,Gas,gen_commit_lin,day,0,0,2,,,1.0,1.0,,1.0,0.4,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Wind,Wind,gen_var,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Battery,Storage,stor,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,,1.0,99.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Hydro,Hydro,gen_hydro_must_take,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_new,Gas,gen_commit_lin,day,0,0,2,,,1.0,1.0,,1.0,0.4,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CT_new,Gas,gen_commit_lin,day,0,0,2,,,1.0,1.0,,1.0,0.4,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Solar,Solar,gen_var,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Nuclear_z2,Nuclear,gen_must_run,day,0,0,1,,,1.0,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal_z2,Coal,gen_commit_lin,day,0,0,1,,,1.0,1.0,,1.0,0.4,,,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_z2,Gas,gen_commit_lin,day,0,0,2,,,1.0,1.0,,1.0,0.4,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CT_z2,Gas,gen_commit_lin,day,0,0,2,,,1.0,1.0,,1.0,0.4,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Wind_z2,Wind,gen_var,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Battery_z2,Storage,stor,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,,1.0,99.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_new_z2,Gas,gen_commit_lin,day,0,0,2,,,1.0,1.0,,1.0,0.4,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CT_new_z2,Gas,gen_commit_lin,day,0,0,2,,,1.0,1.0,,1.0,0.4,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Clunky_Old_Gen,Coal,gen_simple,day,0,0,1,,,1.0,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Wind_new,Wind,gen_var,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+project,technology,operational_type,balancing_type_project,load_modifier_flag,distribution_loss_adjustment_factor,variable_om_cost_per_mwh,variable_om_cost_by_period_scenario_id,variable_om_cost_by_timepoint_scenario_id,variable_om_cost_by_timepoint_tmp_map_scenario_id,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_up_when_on_rate_monthly_adjustment_scenario_id,ramp_down_when_on_rate,ramp_down_when_on_rate_monthly_adjustment_scenario_id,ramp_up_violation_penalty,ramp_down_violation_penalty,bt_hrz_ramp_up_rate_limit_scenario_id,bt_hrz_ramp_down_rate_limit_scenario_id,total_ramp_up_limit_scenario_id,total_ramp_down_limit_scenario_id,ramp_tuning_cost_per_mw,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,max_losses_in_hrz_frac_stor_energy_capacity,flex_load_static_profile_scenario_id,minimum_duration_hours,maximum_duration_hours,aux_consumption_frac_capacity,aux_consumption_frac_power,last_commitment_stage,n_startup_limit_scenario_id,variable_generator_profile_scenario_id,variable_generator_profile_tmp_map_scenario_id,cap_factor_default,curtailment_cost_scenario_id,hydro_operational_chars_scenario_id,hydro_operational_chars_hrz_map_scenario_id,energy_profile_scenario_id,energy_profile_tmp_map_scenario_id,energy_hrz_shaping_scenario_id,energy_hrz_shaping_hrz_map_scenario_id,energy_slice_hrz_shaping_scenario_id,energy_slice_hrz_shaping_hrz_map_scenario_id,base_net_requirement_scenario_id,peak_deviation_demand_charge_scenario_id,lf_reserves_up_derate,lf_reserves_down_derate,regulation_up_derate,regulation_down_derate,frequency_response_derate,spinning_reserves_derate,inertia_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,inertia_constant_sec,powerunithour_per_fuelunit,cap_factor_limits_scenario_id,partial_availability_threshold,stor_exog_state_of_charge_scenario_id,stor_exog_state_of_charge_tmp_map_scenario_id,nonfuel_carbon_emissions_per_mwh,powerhouse,generator_efficiency,linked_load_component,load_modifier_profile_scenario_id,load_modifier_profile_tmp_map_scenario_id,load_component_shift_bounds_scenario_id,load_component_shift_bounds_hrz_map_scenario_id,efficiency_factor,energy_requirement_factor,losses_factor_in_energy_target,losses_factor_curtailment,upward_reserves_to_soc_depletion
+Nuclear,Nuclear,gen_must_run,day,0,0,1,,,,1.0,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Coal,Coal,gen_commit_lin,day,0,0,1,,,,1.0,1.0,,1.0,0.4,,,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CCGT,Gas,gen_commit_lin,day,0,0,2,,,,1.0,1.0,,1.0,0.4,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CT,Gas,gen_commit_lin,day,0,0,2,,,,1.0,1.0,,1.0,0.4,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Wind,Wind,gen_var,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Battery,Storage,stor,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,,1.0,99.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Hydro,Hydro,gen_hydro_must_take,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CCGT_new,Gas,gen_commit_lin,day,0,0,2,,,,1.0,1.0,,1.0,0.4,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CT_new,Gas,gen_commit_lin,day,0,0,2,,,,1.0,1.0,,1.0,0.4,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Solar,Solar,gen_var,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Nuclear_z2,Nuclear,gen_must_run,day,0,0,1,,,,1.0,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Coal_z2,Coal,gen_commit_lin,day,0,0,1,,,,1.0,1.0,,1.0,0.4,,,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CCGT_z2,Gas,gen_commit_lin,day,0,0,2,,,,1.0,1.0,,1.0,0.4,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CT_z2,Gas,gen_commit_lin,day,0,0,2,,,,1.0,1.0,,1.0,0.4,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Wind_z2,Wind,gen_var,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Battery_z2,Storage,stor,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.8,0.8,,,,,,,1.0,99.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CCGT_new_z2,Gas,gen_commit_lin,day,0,0,2,,,,1.0,1.0,,1.0,0.4,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Gas_CT_new_z2,Gas,gen_commit_lin,day,0,0,2,,,,1.0,1.0,,1.0,0.4,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Clunky_Old_Gen,Coal,gen_simple,day,0,0,1,,,,1.0,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Wind_new,Wind,gen_var,day,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,