Merge remote-tracking branch 'rael/wecc' into optional-modules

Author: staadecker

.gitignore

@@ -2,9 +2,6 @@
 # Edit at https://www.toptal.com/developers/gitignore?templates=macos,python,venv,data,visualstudiocode,pycharm,jupyternotebooks,dotenv,virtualenv
 
 ### Data ###
-*.csv
-# Don't ignore data in switch_model.csv
-!switch_model/**/*.csv
 *.dat
 *.efx
 *.gbr
@@ -18,8 +15,11 @@
 *.vcf
 *.xml
 *.pickle
+examples/**/temp/**
+examples/**/outputs/*.csv
+examples/**/outputs/*.txt
+examples/**/graphs/*.png
 examples/**/info.txt
-examples/**/*.png
 
 ### dotenv ###
 .env

database/2021-06-15_add_generation_plants_groups.sql

@@ -0,0 +1,63 @@
+/*
+####################
+Add generation plants groups
+
+Date applied:
+Description:
+This script adds the option to specify generation plant groups.
+The generation groups are specified in the table generation_plant_group.
+Plants are assigned to a group by adding them to the many-to-many table generation_plant_group_member.
+Groups are assigned to a generation_plant_scenario_id by specifying them in generation_plant_scenario_group_member
+#################
+*/
+
+CREATE TABLE switch.generation_plant_group
+(
+    generation_plant_group_id serial                NOT NULL,
+    description               text                  NOT NULL,
+    name                      character varying(30) NOT NULL,
+    PRIMARY KEY (generation_plant_group_id)
+);
+
+COMMENT ON TABLE switch.generation_plant_group
+    IS 'This table specifies all the generation plant groups. Every group has a set of generation plants (see generation_plant_group_member). Groups can be assigned to a generation_plant_scenario (see generation_plant_scenario_group_member).';
+
+CREATE TABLE switch.generation_plant_group_member
+(
+    generation_plant_group_id integer,
+    generation_plant_id       integer,
+    PRIMARY KEY (generation_plant_group_id, generation_plant_id)
+);
+
+ALTER TABLE switch.generation_plant_group_member
+    ADD CONSTRAINT generation_plant_group_member_group_id_fkey
+        FOREIGN KEY (generation_plant_group_id)
+            REFERENCES switch.generation_plant_group (generation_plant_group_id);
+
+ALTER TABLE switch.generation_plant_group_member
+    ADD CONSTRAINT generation_plant_group_member_generation_plant_id_fkey
+        FOREIGN KEY (generation_plant_id)
+            REFERENCES switch.generation_plant (generation_plant_id);
+
+COMMENT ON TABLE switch.generation_plant_group_member
+    IS 'This table is a many-to-many table that specifies the generation plants that are associated with a generation group.';
+
+CREATE TABLE switch.generation_plant_scenario_group_member
+(
+    generation_plant_scenario_id integer,
+    generation_plant_group_id    integer,
+    PRIMARY KEY (generation_plant_scenario_id, generation_plant_group_id)
+);
+
+ALTER TABLE switch.generation_plant_scenario_group_member
+    ADD CONSTRAINT generation_plant_scenario_group_member_scenario_id_fkey
+        FOREIGN KEY (generation_plant_scenario_id)
+            REFERENCES switch.generation_plant_scenario (generation_plant_scenario_id);
+
+ALTER TABLE switch.generation_plant_scenario_group_member
+    ADD CONSTRAINT generation_plant_scenario_group_member_group_id_fkey
+        FOREIGN KEY (generation_plant_group_id)
+            REFERENCES switch.generation_plant_group (generation_plant_group_id);
+
+COMMENT ON TABLE switch.generation_plant_scenario_group_member
+    IS 'This table is a many-to-many table that specifies which generation plant groups belong to which generation plant scenarios';

database/2021-06-18_add_gen_store_energy_to_power_ratio.sql

@@ -0,0 +1,13 @@
+/*
+####################
+Add column gen_store_energy_to_power_ratio
+
+Date applied: 2021-06-18
+Description:
+This script adds a column to the generation_plant
+table called gen_storage_energy_to_power_ratio specifying
+the storage duration
+#################
+*/
+
+ALTER TABLE switch.generation_plant ADD COLUMN gen_storage_energy_to_power_ratio real;

database/2021-06-24_add_transmission_options.sql

@@ -0,0 +1,19 @@
+/*
+####################
+Add transmission options
+
+Date applied: 2021-06-23
+Description:
+Adds two rows to table transmission_base_capital_cost_scenario_id
+1. A scenario where transmission costs are zero.
+2. A scenario where transmission costs are infinity (building not allowed).
+#################
+*/
+
+INSERT INTO switch.transmission_base_capital_cost (transmission_base_capital_cost_scenario_id,
+                                                   trans_capital_cost_per_mw_km, description)
+VALUES (3, 'Infinity', 'For scenarios where building transmission is forbidden.');
+
+INSERT INTO switch.transmission_base_capital_cost (transmission_base_capital_cost_scenario_id,
+                                                   trans_capital_cost_per_mw_km, description)
+VALUES (4, 0, 'For scenarios where transmission is unlimited.');

database/2021-06-29_add_transmission_options_v2.sql

@@ -0,0 +1,13 @@
+/*
+####################
+Add transmission options
+
+Date applied: 2021-06-29
+Description:
+Adds an extra scenario to the database for a 10x increase in transmission costs.
+#################
+*/
+
+INSERT INTO switch.transmission_base_capital_cost (transmission_base_capital_cost_scenario_id,
+                                                   trans_capital_cost_per_mw_km, description)
+VALUES (5, 9600, '10x the costs of scenario #2. Approximates the no TX case.');

database/2021-07-07_add_wind_solar_ratio_column.sql

@@ -0,0 +1,12 @@
+/*
+####################
+Add wind_to_solar_ratio column
+
+Date applied: 2021-07-07
+Description:
+Adds a column called wind_to_solar_ratio to the database which is used by
+switch_model.policies.wind_to_solar_ratio
+#################
+*/
+
+ALTER TABLE switch.scenario ADD COLUMN wind_to_solar_ratio real;

examples/3zone_toy/outputs/total_cost.txt

@@ -1 +1 @@
-128823582.05
+126714451.7

examples/3zone_toy_lp/outputs/total_cost.txt

@@ -1 +1 @@
-128823582.05
+126714451.7

examples/ca_policies/outputs/total_cost.txt

@@ -1 +1 @@
-136941837.16
+134832706.81

examples/carbon_cap/outputs/total_cost.txt

@@ -1 +1 @@
-136638207.50592738
+134529077.16