Merge remote-tracking branch 'rael/wecc' into wecc_update_jszinai

# Conflicts:
#	switch_model/wecc/get_inputs.py

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,10 @@
 *.vcf
 *.xml
 *.pickle
+examples/**/outputs/*.csv
+examples/**/outputs/*.txt
+examples/**/graphs/*.png
 examples/**/info.txt
-examples/**/*.png
 
 ### dotenv ###
 .env
@@ -312,4 +311,7 @@ gurobi.log
 *.pdb
 *.sqlite3
 
+### VIM ###
+tags
+
 # End of https://www.toptal.com/developers/gitignore/api/macos,python,venv,data,visualstudiocode,pycharm,jupyternotebooks,dotenv,virtualenv

README.md

@@ -0,0 +1,18 @@
+/*
+####################
+Add load zone: ALL
+
+Date applied:
+Description: This script adds a load_zone called ALL. The all load_zone can be used
+to specify that a plant should belong to all load zones. get_inputs.py will handle copying the plant
+to all the load zones.
+#################
+*/
+
+INSERT INTO switch.load_zone (load_zone_id, name, description)
+VALUES (
+        51,
+        '_ALL_ZONES',
+        'This zone can only be used to specify that a generation plant should be copied to all the other zones.' ||
+        'This zone will be filtered out during get_inputs and should never be read by SWITCH.'
+        );

database/2021-06-11_add_ALL_load_zone.sql

@@ -0,0 +1,15 @@
+/*
+####################
+Add Improved Storage Module columns
+
+Date applied: 2021-06-11
+Description: This script adds the columns daily_self_discharge_rate, discharge_efficiency and
+land_use_rate to the generation_plant table. These columns were added as part of the
+improvements to the storage module that Martin Staadecker completed when studying long-duration
+energy storage. See REAM-lab pull request #42.
+#################
+*/
+
+ALTER TABLE switch.generation_plant ADD COLUMN daily_self_discharge_rate real;
+ALTER TABLE switch.generation_plant ADD COLUMN discharge_efficiency real;
+ALTER TABLE switch.generation_plant ADD COLUMN land_use_rate real;

database/2021-06-11_add_storage_params.sql

@@ -0,0 +1,13 @@
+/*
+####################
+TITLE
+
+Date applied:
+Description:
+...
+...
+...
+#################
+*/
+
+-- SQL Code goes here