Support for fuel blending (#853)

blue-marble · Dec 13, 2021 · c0ec4d2 · c0ec4d2
1 parent 5e1a05d
commit c0ec4d2
Show file tree

Hide file tree

Showing 318 changed files with 2,676 additions and 1,252 deletions.
diff --git a/db/csvs_test_examples/csv_data_master.csv b/db/csvs_test_examples/csv_data_master.csv
@@ -17,6 +17,7 @@ project/project_new_potential,data_dependent,project_new_potential_scenario_id,p
 project/project_new_binary_build_size,data_dependent,project_new_binary_build_size_scenario_id,project_new_binary_build_size,simple,,0,0,,,,
 project/project_capacity_groups/requirements,data_dependent,project_capacity_group_requirement_scenario_id,project_capacity_group_requirements,simple,,0,0,,,,
 project/project_capacity_groups/projects,data_dependent,project_capacity_group_scenario_id,project_capacity_groups,simple,,0,0,,,,
+project/project_fuels,data_dependent,project_fuel_scenario_id,project_fuels,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_heat_rate_curves,data_dependent,heat_rate_curves_scenario_id,project_heat_rate_curves,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_variable_om_curves,data_dependent,variable_om_curves_scenario_id,project_variable_om_curves,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
 project/project_startup_chars,data_dependent,startup_chars_scenario_id,project_startup_chars,simple,,1,0,,,inputs_project_operational_chars,project_operational_chars_scenario_id
@@ -27,8 +28,8 @@ project/project_operational_chars,core,project_operational_chars_scenario_id,pro
 project/project_availability/project_availability_types,data_dependent,project_availability_scenario_id,project_availability,simple,,0,0,,,,
 project/project_availability/project_availability_endogenous,data_dependent,endogenous_availability_scenario_id,project_availability_endogenous,simple,,1,0,,,inputs_project_availability,project_availability_scenario_id
 project/project_availability/project_availability_exogenous,data_dependent,exogenous_availability_scenario_id,project_availability_exogenous,simple,,1,0,,,inputs_project_availability,project_availability_scenario_id
-fuels/project_fuels,fuels,fuel_scenario_id,project_fuels,simple,,0,0,,,,
-fuels/project_fuel_prices,fuels,fuel_price_scenario_id,project_fuel_prices,simple,,0,0,,,,
+fuels/fuel_chars,fuels,fuel_scenario_id,fuels,simple,,0,0,,,,
+fuels/fuel_prices,fuels,fuel_price_scenario_id,fuel_prices,simple,,0,0,,,,
 transmission/transmission_portfolios,transmission,transmission_portfolio_scenario_id,transmission_portfolios,simple,,0,0,,,,
 transmission/transmission_load_zones,transmission,transmission_load_zone_scenario_id,transmission_load_zones,simple,,0,0,,,,
 transmission/transmission_specified_capacity,transmission,transmission_specified_capacity_scenario_id,transmission_specified_capacity,simple,,0,0,,,,

diff --git a/...fuels/project_fuels/1_project_fuels_1.csv → ...es/fuels/fuel_chars/1_base_fuel_chars.csv b/...fuels/project_fuels/1_project_fuels_1.csv → ...es/fuels/fuel_chars/1_base_fuel_chars.csv
@@ -1,4 +1,6 @@
-fuel,co2_intensity_tons_per_mmbtu
-Coal,0.09552
-Gas,0.05306
-Uranium,0
+fuel,co2_intensity_tons_per_mmbtu
+Coal,0.09552
+Gas,0.05306
+Uranium,0
+Cheap_Fuel,0.05306
+Negative_Carbon_Fuel,-0.1
diff --git a/..._test_examples/fuels/project_fuels/doc.py → ...svs_test_examples/fuels/fuel_chars/doc.py b/..._test_examples/fuels/project_fuels/doc.py → ...svs_test_examples/fuels/fuel_chars/doc.py
@@ -6,9 +6,9 @@
 +--------------------------------+-----------------------------------+
 |:code:`scenarios` table column  |:code:`fuel_scenario_id`           |
 +--------------------------------+-----------------------------------+
-|:code:`subscenario_` table      |:code:`subscenarios_project_fuels` |
+|:code:`subscenario_` table      |:code:`subscenarios_fuels`         |
 +--------------------------------+-----------------------------------+
-|:code:`input_` tables           |:code:`inputs_project_fuels`       |
+|:code:`input_` tables           |:code:`inputs_fuels`               |
 +--------------------------------+-----------------------------------+
 
 """

diff --git a/db/csvs_test_examples/fuels/fuel_prices/1_base_fuel_prices.csv b/db/csvs_test_examples/fuels/fuel_prices/1_base_fuel_prices.csv
@@ -0,0 +1,21 @@
+fuel,period,month,fuel_price_per_mmbtu
+Coal,2020,1,4
+Coal,2020,2,4
+Coal,2030,1,4
+Coal,2030,2,4
+Gas,2020,1,5
+Gas,2020,2,5
+Gas,2030,1,5
+Gas,2030,2,5
+Uranium,2020,1,2
+Uranium,2020,2,2
+Uranium,2030,1,2
+Uranium,2030,2,2
+Cheap_Fuel,2020,1,1
+Cheap_Fuel,2020,2,1
+Cheap_Fuel,2030,1,1
+Cheap_Fuel,2030,2,1
+Negative_Carbon_Fuel,2020,1,6
+Negative_Carbon_Fuel,2020,2,6
+Negative_Carbon_Fuel,2030,1,6
+Negative_Carbon_Fuel,2030,2,6
diff --git a/...examples/fuels/project_fuel_prices/doc.py → ...vs_test_examples/fuels/fuel_prices/doc.py b/...examples/fuels/project_fuel_prices/doc.py → ...vs_test_examples/fuels/fuel_prices/doc.py
diff --git a/db/csvs_test_examples/fuels/project_fuel_prices/1_project_fuel_prices_1.csv b/db/csvs_test_examples/fuels/project_fuel_prices/1_project_fuel_prices_1.csv
diff --git a/db/csvs_test_examples/project/project_fuels/Clunky_Old_Gen-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Clunky_Old_Gen-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Coal
diff --git a/db/csvs_test_examples/project/project_fuels/Coal-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Coal-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Coal
diff --git a/db/csvs_test_examples/project/project_fuels/Coal_z2-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Coal_z2-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Coal
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CCGT-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CCGT-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CCGT-2-blend_cheap_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CCGT-2-blend_cheap_fuel.csv
@@ -0,0 +1,3 @@
+fuel
+Gas
+Cheap_Fuel
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CCGT-3-negative_carbon_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CCGT-3-negative_carbon_fuel.csv
@@ -0,0 +1,3 @@
+fuel
+Gas
+Negative_Carbon_Fuel
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CCGT_new-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CCGT_new-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CCGT_new_z2-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CCGT_new_z2-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CCGT_z2-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CCGT_z2-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CCGT_z3-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CCGT_z3-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CT-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CT-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CT_new-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CT_new-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CT_new_z2-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CT_new_z2-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Gas_CT_z2-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Gas_CT_z2-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Gas
diff --git a/db/csvs_test_examples/project/project_fuels/Nuclear-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Nuclear-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Uranium
diff --git a/db/csvs_test_examples/project/project_fuels/Nuclear_z2-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Nuclear_z2-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Uranium
diff --git a/db/csvs_test_examples/project/project_fuels/Clunky_Old_Gen-1-base_fuel.csv b/db/csvs_test_examples/project/project_fuels/Clunky_Old_Gen-1-base_fuel.csv
@@ -0,0 +1,2 @@
+fuel
+Coal
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,fuel,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,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,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
-Nuclear,Nuclear,gen_must_run,day,1,Uranium,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal,Coal,gen_commit_lin,day,1,Coal,1,,1,0.4,,,0,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
-Gas_CCGT,Gas,gen_commit_lin,day,2,Gas,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CT,Gas,gen_commit_lin,day,2,Gas,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+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,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,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
+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,Gas,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CT_new,Gas,gen_commit_lin,day,2,Gas,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+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,Uranium,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal_z2,Coal,gen_commit_lin,day,1,Coal,1,,1,0.4,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_z2,Gas,gen_commit_lin,day,2,Gas,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CT_z2,Gas,gen_commit_lin,day,2,Gas,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+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,Gas,1,,1,0.4,,,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CT_new_z2,Gas,gen_commit_lin,day,2,Gas,1,,1,0.4,,,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
-Clunky_Old_Gen,Coal,gen_simple,day,1,Coal,1,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
-Wind_new,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
+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,fuel,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,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,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
-Nuclear,Nuclear,gen_must_run,day,1,Uranium,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal,Coal,gen_commit_cap,day,1,Coal,1,,,0.4,6,1,0,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
-Gas_CCGT,Gas,gen_commit_bin,day,2,Gas,1,,2,0.4,,,2,,,0.012,,,,,,,6,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CT,Gas,gen_commit_cap,day,2,Gas,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+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,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,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
+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,,,,,,,,,,,,,,,
+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,Gas,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CT_new,Gas,gen_commit_cap,day,2,Gas,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+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,Uranium,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Coal_z2,Coal,gen_commit_cap,day,1,Coal,1,,,0.4,6,1,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Gas_CCGT_z2,Gas,gen_commit_cap,day,2,Gas,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CT_z2,Gas,gen_commit_cap,day,2,Gas,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
+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,Gas,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
-Gas_CT_new_z2,Gas,gen_commit_cap,day,2,Gas,1,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
-Clunky_Old_Gen,Coal,gen_simple,day,1,Coal,1,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
+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,Gas,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+Gas_CCGT_z3,Gas,gen_commit_cap,day,2,1,1,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
diff --git a/...amples/project/project_operational_chars/12_project_operational_chars_2zones_no_fuels.csv b/...amples/project/project_operational_chars/12_project_operational_chars_2zones_no_fuels.csv
@@ -1,4 +1,4 @@
-project,technology,operational_type,balancing_type_project,variable_om_cost_per_mwh,fuel,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,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,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
+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,charging_efficiency,discharging_efficiency,charging_capacity_multiplier,discharging_capacity_multiplier,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
 Nuclear,Nuclear,gen_must_run,day,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 Coal,Coal,gen_commit_cap,day,1,,,,,0.4,6,1,0,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
 Gas_CCGT,Gas,gen_commit_cap,day,2,,,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
@@ -19,4 +19,4 @@ Gas_CCGT_new_z2,Gas,gen_commit_cap,day,2,,,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,
 Gas_CT_new_z2,Gas,gen_commit_cap,day,2,,,,,0.4,6,0,1,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,
 Clunky_Old_Gen,Coal,gen_simple,day,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,
 Wind_new,Wind,gen_var,day,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
-Gas_CCGT_z3,Gas,gen_commit_cap,day,2,,,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,
+Gas_CCGT_z3,Gas,gen_commit_cap,day,2,,,,,0.4,6,1,2,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,