Merge pull request #979 from blue-marble/develop

GridPath v0.15.0

README.md

@@ -24,32 +24,45 @@ GridPath's documentation is hosted on [Read the Docs](https://gridpath.readthedo
 # Installation
 
 ## Python
-GridPath is tested on Python 3.8, 3.9, and 3.10. Get Python
+GridPath is tested on Python 3.8, 3.9, and 3.10. We recommend using Python 3.9. Get 
+Python
 [here](https://www.python.org/downloads/ "Python download").
 
-## Python Packages
+## GridPath Python environment
 You should create a Python environment for your GridPath installation, e.g. via 
-`venv`, [a lightweight environment manager](https://docs.python.org/3/library/venv.html, "venv") 
-that is part of the standard Python distribution. You can install all needed Python 
-packages, including the developer extras, by navigating to the GridPath root 
+`venv`, [a lightweight environment manager](https://docs.python.org/3/library/venv.html "venv") 
+that is part of the standard Python distribution. Make sure to [create](https://docs.python.org/3/library/venv.html#creating-virtual-environments "create") [activate](https://docs.python.org/3/library/venv.html#how-venvs-work "activate") the environment before installing GridPath.
+
+## Install GridPath
+
+Once you have _created and activated_ the GridPath Python environment, you can install GridPath and the Python packages it uses.
+
+For most users, installing GridPath's base set of Python packages and those needed 
+to use the graphical user interface would be sufficient. You can do so by navigating to the GridPath root 
 directory (which is where this `README.md` file is located) and running:
 ```bash
-pip install -e .[all]
+pip install .[ui]
 ```
 
-For most users, installing GridPath's base set of Python packages and those needed 
-to use the graphical user interface would be sufficient. You can do so by running:
+You can install all needed Python 
+packages, including the developer extras by running:
 ```bash
-pip install -e .[ui]
+pip install .[all]
 ```
 
-NOTE: if you don't plan to edit the GridPath code, you can install without the 
-`-e` option.
+**NOTE:** If you plan to edit the GridPath code, you should install with the `-e` flag.
 
 ## Solver
-You will need a solver to use this platform. GridPath assumes you will be 
-using Cbc (Coin-or branch and cut) by default, but you can specify a 
-different solver (see the **Usage** section).
+You will need a solver to use this platform. GridPath assumes you will be using Cbc (Coin-or branch and cut) by default, but you can specify a 
+different solver.
+
+## Testing your installation
+
+To test the GridPath codebase, [make sure the GridPath environment you installed to 
+is activated](https://docs.python.org/3/library/venv.html#how-venvs-work "activate") and use the unittest module as follows from the root directory:
+```bash
+python -m unittest discover tests
+```
 
 # Usage
 
@@ -65,7 +78,7 @@ gridpath_run --scenario SCENARIO_NAME --scenario_location
 If you are using the database, you can use the command `gridpath_run_e2e` to 
 run GridPath end-to-end, i.e. get inputs for the scenario from the database, 
 solve the scenario problem, import the results into the database, and 
-process them.
+process them. Refer to the documentation for how to build the database.
 
 ```bash
 gridpath_run_e2e --scenario SCENARIO_NAME --scenario_location 
@@ -78,24 +91,10 @@ solver, check the help menu, e.g.:
 gridpath_run --help
 ```
 
-NOTE: To activate your gridpath environment, use the following command (
-assuming your environment is called "env", is created with `venv`, and is stored 
-in the GridPath root folder):
-```bash
-source env/bin/activate
-```
 
 ## Help
 In general, you can check usage of GridPath's scripts by calling the `--help` 
 option, e.g.:
 ```bash
 python get_scenario_inputs.py --help
 ```
-
-# Testing
-
-To test the GridPath codebase, use the unittest module as follows from the 
-root directory:
-```bash
-python -m unittest discover tests
-```

db/create_database.py

@@ -13,12 +13,14 @@
 # limitations under the License.
 
 """
-Create the database and make schema.
+This script create an empty GridPath database with the appropriate table structure.
 
-TODO: expand this description of the table naming conventions
-The schema for the GridPath SQLite database is in db_schema.sql
-Table names follow a pre-defined structure.
+The user may specify the name and location of the GridPath database path using the
+*--database* flag.
 
+>>> python create_database.py --database PATH/DO/DB
+
+The default schema for the GridPath SQLite database is in db_schema.sql.
 
 .. _database-structure-section-ref:
 
@@ -45,9 +47,9 @@ def parse_arguments(arguments):
     # Scenario name and location options
     parser.add_argument(
         "--database",
-        default="../db/io.db",
+        default="./io.db",
         help="The database file path relative to the current "
-        "working directory. Defaults to ../db/io.db ",
+        "working directory. Defaults to ./io.db ",
     )
     parser.add_argument(
         "--db_schema",

db/csvs_test_examples/csv_data_master.csv

@@ -105,9 +105,14 @@ policy/fuel_burn_limits/project_bas,fuel_burn_limit,project_fuel_burn_limit_ba_s
 policy/fuel_burn_limits/limits,fuel_burn_limit,fuel_burn_limit_scenario_id,system_fuel_burn_limits,simple,,0,0,,,,
 reliability/prm/geography_prm_zones,prm,prm_zone_scenario_id,geography_prm_zones,simple,,0,0,,,,
 reliability/prm/project_prm_zones,prm,project_prm_zone_scenario_id,project_prm_zones,simple,,0,0,,,,
+reliability/prm/project_elcc_chars/simple_elcc,prm,project_elcc_simple_scenario_id,project_elcc_simple,simple,,1,0,,,,
+reliability/prm/project_elcc_chars/deliverability,prm,project_deliverability_scenario_id,project_deliverability,simple,,1,0,,,,
 reliability/prm/project_elcc_chars,prm,project_elcc_chars_scenario_id,project_elcc_chars,simple,,0,0,,,,
-reliability/prm/project_prm_energy_only,prm,prm_energy_only_scenario_id,project_prm_energy_only,simple,,0,0,,,,
 reliability/prm/system_prm_requirement,prm,prm_requirement_scenario_id,system_prm_requirement,simple,,0,0,,,,
+reliability/prm/deliverability/costs,deliverability,prm_deliverability_cost_scenario_id,project_prm_deliverability_costs,simple,,0,0,,,,
+reliability/prm/deliverability/existing,deliverability,prm_deliverability_existing_scenario_id,project_prm_deliverability_existing,simple,,0,0,,,,
+reliability/prm/deliverability/potential,deliverability,prm_deliverability_potential_scenario_id,project_prm_deliverability_potential,simple,,0,0,,,,
+reliability/prm/deliverability/multipliers,deliverability,project_prm_deliverability_multipliers_scenario_id,project_prm_deliverability_multipliers,simple,,0,0,,,,
 reliability/prm/elcc_surface,elcc_surface,elcc_surface_scenario_id,system_prm_zone_elcc_surface,dir_main,,0,0,zone_intercepts.csv,,,
 reliability/prm/elcc_surface,elcc_surface,elcc_surface_scenario_id,system_prm_zone_elcc_surface_prm_load,dir_aux,,0,0,zone_peak_and_annual_load.csv,,,
 reliability/prm/elcc_surface,elcc_surface,elcc_surface_scenario_id,project_elcc_surface,dir_aux,,0,0,project_coefficients.csv,,,

db/csvs_test_examples/markets/volume/1_base_volume.csv

@@ -1,19 +1,19 @@
-market,stage_id,timepoint,max_market_sales,max_market_purchases
-Market_Hub,1,20200101,10,5
-Market_Hub,1,20200102,5,10
-Market_Hub,1,20200201,10,5
-Market_Hub,1,20200202,5,10
-Market_Hub,1,20200301,10,5
-Market_Hub,1,20200302,5,10
-Market_Hub2,1,20200101,10,5
-Market_Hub2,1,20200102,5,10
-Market_Hub2,1,20200201,10,5
-Market_Hub2,1,20200202,5,10
-Market_Hub2,1,20200301,10,5
-Market_Hub2,1,20200302,5,10
-Market_Hub2,2,20200101,5,5
-Market_Hub2,2,20200102,2,2
-Market_Hub2,2,20200201,5,5
-Market_Hub2,2,20200202,2,2
-Market_Hub2,2,20200301,5,5
-Market_Hub2,2,20200302,2,2
+market,stage_id,timepoint,max_market_sales,max_market_purchases,max_final_market_sales,max_final_market_purchases
+Market_Hub,1,20200101,10,5,,
+Market_Hub,1,20200102,5,10,,
+Market_Hub,1,20200201,10,5,,
+Market_Hub,1,20200202,5,10,,
+Market_Hub,1,20200301,10,5,,
+Market_Hub,1,20200302,5,10,,
+Market_Hub2,1,20200101,10,5,,
+Market_Hub2,1,20200102,5,10,,
+Market_Hub2,1,20200201,10,5,,
+Market_Hub2,1,20200202,5,10,,
+Market_Hub2,1,20200301,10,5,,
+Market_Hub2,1,20200302,5,10,,
+Market_Hub2,2,20200101,5,5,,
+Market_Hub2,2,20200102,2,2,,
+Market_Hub2,2,20200201,5,5,,
+Market_Hub2,2,20200202,2,2,,
+Market_Hub2,2,20200301,5,5,,
+Market_Hub2,2,20200302,2,2,,

db/csvs_test_examples/project/project_new_cost/1_project_new_cost_1.csv

@@ -1,17 +1,17 @@
-project,vintage,lifetime_yrs,annualized_real_cost_per_mw_yr,annualized_real_cost_per_mwh_yr,levelized_cost_per_mwh,supply_curve_scenario_id,fuel_production_capacity_cost_per_fuelunitperhour_yr,fuel_release_capacity_cost_per_fuelunitperhour_yr,fuel_storage_capacity_cost_per_fuelunit_yr
-Gas_CCGT_new,2020,30,200000,,,,,,
-Solar,2020,30,100,,,,,,
-Gas_CCGT_new_z2,2020,30,200000,,,,,,
-Solar_z2,2020,30,100,,,,,,
-Gas_CCGT_new,2030,30,180000,,,,,,
-Gas_CT_new,2030,30,140000,,,,,,
-Solar,2030,30,100,,,,,,
-Gas_CCGT_new_z2,2030,30,180000,,,,,,
-Gas_CT_new_z2,2030,30,140000,,,,,,
-Solar_z2,2030,30,100,,,,,,
-Battery,2020,10,1,1,,,,,
-Battery,2030,10,1,1,,,,,
-Wind_new,2020,30,1000000,,,,,,
-Wind_new,2030,30,1000000,,,,,,
-Hydrogen_Prod,2020,30,,,,,1,1,1
-Hydrogen_Prod,2030,30,,,,,1,1,1
+project,vintage,operational_lifetime_yrs,fixed_cost_per_mw_yr,fixed_cost_per_mwh_yr,fuel_production_capacity_fixed_cost_per_fuelunitperhour_yr,fuel_release_capacity_fixed_cost_per_fuelunitperhour_yr,fuel_storage_capacity_fixed_cost_per_fuelunit_yr,financial_lifetime_yrs,annualized_real_cost_per_mw_yr,annualized_real_cost_per_mwh_yr,fuel_production_capacity_cost_per_fuelunitperhour_yr,fuel_release_capacity_cost_per_fuelunitperhour_yr,fuel_storage_capacity_cost_per_fuelunit_yr,supply_curve_scenario_id
+Gas_CCGT_new,2020,30,0,,,,,30,200000,,,,,
+Solar,2020,30,0,,,,,30,100,,,,,
+Gas_CCGT_new_z2,2020,30,0,,,,,30,200000,,,,,
+Solar_z2,2020,30,0,,,,,30,100,,,,,
+Gas_CCGT_new,2030,30,0,,,,,30,180000,,,,,
+Gas_CT_new,2030,30,0,,,,,30,140000,,,,,
+Solar,2030,30,0,,,,,30,100,,,,,
+Gas_CCGT_new_z2,2030,30,0,,,,,30,180000,,,,,
+Gas_CT_new_z2,2030,30,0,,,,,30,140000,,,,,
+Solar_z2,2030,30,0,,,,,30,100,,,,,
+Battery,2020,10,0,0,,,,10,1,1,,,,
+Battery,2030,10,0,0,,,,10,1,1,,,,
+Wind_new,2020,30,0,,,,,30,1000000,,,,,
+Wind_new,2030,30,0,,,,,30,1000000,,,,,
+Hydrogen_Prod,2020,30,,,0,0,0,30,,,1,1,1,
+Hydrogen_Prod,2030,30,,,0,0,0,30,,,1,1,1,

db/csvs_test_examples/project/project_new_cost/2_different_fin_lifetimes.csv

@@ -0,0 +1,17 @@
+project,vintage,operational_lifetime_yrs,fixed_cost_per_mw_yr,fixed_cost_per_mwh_yr,fuel_production_capacity_fixed_cost_per_fuelunitperhour_yr,fuel_release_capacity_fixed_cost_per_fuelunitperhour_yr,fuel_storage_capacity_fixed_cost_per_fuelunit_yr,financial_lifetime_yrs,annualized_real_cost_per_mw_yr,annualized_real_cost_per_mwh_yr,fuel_production_capacity_cost_per_fuelunitperhour_yr,fuel_release_capacity_cost_per_fuelunitperhour_yr,fuel_storage_capacity_cost_per_fuelunit_yr,supply_curve_scenario_id
+Gas_CCGT_new,2020,30,1000,,,,,10,200000,,,,,
+Solar,2020,30,1000,,,,,10,100,,,,,
+Gas_CCGT_new_z2,2020,30,1000,,,,,10,200000,,,,,
+Solar_z2,2020,30,1000,,,,,10,100,,,,,
+Gas_CCGT_new,2030,30,1000,,,,,10,180000,,,,,
+Gas_CT_new,2030,30,1000,,,,,10,140000,,,,,
+Solar,2030,30,1000,,,,,10,100,,,,,
+Gas_CCGT_new_z2,2030,30,1000,,,,,10,180000,,,,,
+Gas_CT_new_z2,2030,30,1000,,,,,10,140000,,,,,
+Solar_z2,2030,30,1000,,,,,10,100,,,,,
+Battery,2020,10,1000,200,,,,10,1,1,,,,
+Battery,2030,10,1000,200,,,,10,1,1,,,,
+Wind_new,2020,30,1000,,,,,0,1000000,,,,,
+Wind_new,2030,30,1000,,,,,0,1000000,,,,,
+Hydrogen_Prod,2020,30,,,0,0,0,0,,,1,1,1,
+Hydrogen_Prod,2030,30,,,0,0,0,0,,,1,1,1,

db/csvs_test_examples/project/project_new_potential/1_project_new_potential_1.csv

@@ -1 +1,15 @@
-project,period,min_cumulative_new_build_mw,max_cumulative_new_build_mw,min_cumulative_new_build_mwh,max_cumulative_new_build_mwhGas_CCGT_new,2020,0,20,,Gas_CT_New,2020,0,10,,Solar,2020,0,4,,Gas_CCGT_new_z2,2020,0,20,,Gas_CT_new_z2,2020,10,,,Solar_z2,2020,0,4,,Gas_CCGT_new,2030,0,20,,Gas_CT_new,2030,10,,,Solar,2030,0,4,,Gas_CCGT_new_z2,2030,0,20,,Gas_CT_new_z2,2030,10,,,Solar_z2,2030,0,4,,Battery,2020,0,6,,7Battery,2030,10,,15,
+project,period,min_new_build_power,max_new_build_power,min_capacity_power,max_capacity_power,min_new_build_energy,max_new_build_energy,min_capacity_energy,max_capacity_energy
+Gas_CCGT_new,2020,,,0,20,,,,
+Gas_CT_New,2020,,,0,10,,,,
+Solar,2020,,,0,4,,,,
+Gas_CCGT_new_z2,2020,,,0,20,,,,
+Gas_CT_new_z2,2020,,,10,,,,,
+Solar_z2,2020,,,0,4,,,,
+Gas_CCGT_new,2030,,,0,20,,,,
+Gas_CT_new,2030,,,10,,,,,
+Solar,2030,,,0,4,,,,
+Gas_CCGT_new_z2,2030,,,0,20,,,,
+Gas_CT_new_z2,2030,,,10,,,,,
+Solar_z2,2030,,,0,4,,,,
+Battery,2020,,,0,6,,,,7
+Battery,2030,,,10,,,,15,

db/csvs_test_examples/project/project_new_potential/2_project_new_potential_2.csv

@@ -1 +1,3 @@
-project,period,min_cumulative_new_build_mw,max_cumulative_new_build_mw,min_cumulative_new_build_mwh,max_cumulative_new_build_mwhSolar,2020,0,2,,Solar,2030,0,2,,
+project,period,min_new_build_power,max_new_build_power,min_capacity_power,max_capacity_power,min_new_build_energy,max_new_build_energy,min_capacity_energy,max_capacity_energy
+Solar,2020,,,0,2,,,,
+Solar,2030,,,0,2,,,,

db/csvs_test_examples/project/project_new_potential/3_cumulative_and_vintage_constraints.csv

@@ -0,0 +1,4 @@
+project,period,min_new_build_power,max_new_build_power,min_capacity_power,max_capacity_power,min_new_build_energy,max_new_build_energy,min_capacity_energy,max_capacity_energy
+Gas_CCGT_new,2020,,10,0,20,,,,
+Gas_CCGT_new,2030,,,0,20,,,,
+Gas_CT_new,2030,30,,10,,,,,

db/csvs_test_examples/project/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,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,powerunithour_per_fuelunit,cap_factor_limits_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,,,,,,,,,,,,,,,,
+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,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,powerunithour_per_fuelunit,cap_factor_limits_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,,,,,,,,,,,,,,,,