GridPath v2026.2.0

Merge pull request #1339 from blue-marble/develop

Author: anamileva

data_toolkit/project/opchar/eia860_to_project_opchar_input_csvs.py

@@ -276,6 +276,7 @@ def make_opchar_sql_str(
     aux_consumption_frac_capacity="NULL",
     aux_consumption_frac_power="NULL",
     last_commitment_stage="NULL",
+    n_startup_limit_scenario_id="NULL",
     variable_generator_profile_scenario_id="NULL",
     curtailment_cost_scenario_id="NULL",
     hydro_operational_chars_scenario_id="NULL",
@@ -373,7 +374,8 @@ def make_opchar_sql_str(
      {maximum_duration_hours} AS maximum_duration_hours,
      {aux_consumption_frac_capacity} AS aux_consumption_frac_capacity,	
      {aux_consumption_frac_power} AS aux_consumption_frac_power,
-     {last_commitment_stage} AS last_commitment_stage,	
+     {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,
      {curtailment_cost_scenario_id} AS curtailment_cost_scenario_id,	
      {hydro_operational_chars_scenario_id} AS hydro_operational_chars_scenario_id,

db/csvs_test_examples/csv_structure.csv

@@ -60,6 +60,7 @@ project/opchar/load_component_shift_bounds,data_dependent,load_component_shift_b
 project/opchar/load_component_shift_bounds/iterations,data_dependent,load_component_shift_bounds_scenario_id,project_load_component_shift_bounds_iterations,skip_subscenario,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 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,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,,,,,
@@ -218,4 +219,4 @@ water/powerhouses,water,water_powerhouse_scenario_id,system_water_powerhouses,si
 policy/generic/geography,policy,policy_zone_scenario_id,geography_policy_zones,simple,,0,,,,,
 policy/generic/requirements,policy,policy_requirement_scenario_id,system_policy_requirements,dir_main,,0,,requirements.csv,,,
 policy/generic/requirements,policy,policy_requirement_scenario_id,system_policy_requirements_load_zone_map,dir_aux,,0,,load_zone_mapping.csv,,,
-policy/generic/project_policy_zones,policy,project_policy_zone_scenario_id,project_policy_zones,simple,,0,,,,,
+policy/generic/project_policy_zones,policy,project_policy_zone_scenario_id,project_policy_zones,simple,,0,,,,,

db/csvs_test_examples/fuels/fuel_prices/1_base_fuel_prices.csv

@@ -22,4 +22,28 @@ Negative_Carbon_Fuel,2030,2,6
 Hydrogen,2020,1,0.1
 Hydrogen,2020,2,0.1
 Hydrogen,2030,1,0.1
-Hydrogen,2030,2,0.1
+Hydrogen,2030,2,0.1
+Coal,20301,1,4
+Coal,20301,2,4
+Gas,20301,1,5
+Gas,20301,2,5
+Uranium,20301,1,2
+Uranium,20301,2,2
+Cheap_Fuel,20301,1,1
+Cheap_Fuel,20301,2,1
+Negative_Carbon_Fuel,20301,1,6
+Negative_Carbon_Fuel,20301,2,6
+Hydrogen,20301,1,0.1
+Hydrogen,20301,2,0.1
+Coal,20302,1,4
+Coal,20302,2,4
+Gas,20302,1,5
+Gas,20302,2,5
+Uranium,20302,1,2
+Uranium,20302,2,2
+Cheap_Fuel,20302,1,1
+Cheap_Fuel,20302,2,1
+Negative_Carbon_Fuel,20302,1,6
+Negative_Carbon_Fuel,20302,2,6
+Hydrogen,20302,1,0.1
+Hydrogen,20302,2,0.1

db/csvs_test_examples/project/capacity/new_cost/1_project_new_cost_1.csv

@@ -22,4 +22,8 @@ DSM_EE,2026,1,0,,,,,,1,1,,,,,,
 DSM_EV,2026,1,0,,,,,,1,1,,,,,,
 DSM_Load_Shed,2026,1,0,,,,,,1,1,,,,,,
 DSM_Load_Component_Modifier,2026,1,0,,,,,,1,1,,,,,,
-DSM_Load_Component_Shift,2026,1,0,,,,,,1,1,,,,,,
+DSM_Load_Component_Shift,2026,1,0,,,,,,1,1,,,,,,
+Gas_CCGT_new,20301,30,0,,,,,,30,180000,,,,,,
+Gas_CT_new,20301,30,0,,,,,,30,140000,,,,,,
+Gas_CCGT_new,20302,30,0,,,,,,30,180000,,,,,,
+Gas_CT_new,20302,30,0,,,,,,30,140000,,,,,,

db/csvs_test_examples/project/capacity/new_potential/1_project_new_potential_1.csv

@@ -18,4 +18,8 @@ Hydro,2020,,,,,,,,,,,,26280
 DSM_Flat_Load_Reduction,2026,,,,10,,,,,,,,
 DSM_EE,2026,,,,10,,,,,,,,
 DSM_EV,2026,,,,10,,,,,,,,
-DSM_Load_Shed,2026,,,,10,,,,,,,,
+DSM_Load_Shed,2026,,,,10,,,,,,,,
+Gas_CT_new,20301,,,,40,,,,,,,,
+Gas_CT_new,20302,,,,40,,,,,,,,
+Gas_CCGT_new,20301,,5,,,,,,,,,,
+Gas_CCGT_new,20302,,5,,,,,,,,,,

db/csvs_test_examples/project/capacity/specified_capacity/1_project_existing_capacity_2zones.csv

@@ -61,4 +61,23 @@ RECs,2020,999,,,,,,,,
 RECs,2030,999,,,,,,,,
 synch_condenser,2020,30,,,,,,,,
 synch_condenser,2030,30,,,,,,,,
-, ,,,,,,,,,
+Coal,20301,6,,,,,,,,
+Gas_CCGT,20301,6,,,,,,,,
+Gas_CT,20301,6,,,,,,,,
+Nuclear,20301,6,,,,,,,,
+Wind,20301,2,,,,,,,,
+Coal_z2,20301,6,,,,,,,,
+Gas_CCGT_z2,20301,6,,,,,,,,
+Gas_CT_z2,20301,6,,,,,,,,
+Nuclear_z2,20301,6,,,,,,,,
+Wind_z2,20301,2,,,,,,,,
+Coal,20302,6,,,,,,,,
+Gas_CCGT,20302,6,,,,,,,,
+Gas_CT,20302,6,,,,,,,,
+Nuclear,20302,6,,,,,,,,
+Wind,20302,2,,,,,,,,
+Coal_z2,20302,6,,,,,,,,
+Gas_CCGT_z2,20302,6,,,,,,,,
+Gas_CT_z2,20302,6,,,,,,,,
+Nuclear_z2,20302,6,,,,,,,,
+Wind_z2,20302,2,,,,,,,,

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,variable_generator_profile_scenario_id,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,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,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,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,