Merge pull request #20 from ucsusa/snakemake

Fix bug that lead to infeasible electricity demand
ucsusa · Jun 24, 2024 · c5e8bc2 · c5e8bc2
2 parents 410906c + 36b1345
commit c5e8bc2
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 125,217 deletions.
diff --git a/.gitignore b/.gitignore
@@ -163,4 +163,12 @@ cython_debug/
 Electric_Retail_Service_Territories
 Electric__Power_Transmission_Lines
 
-.snakemake
+.snakemake
+
+data/*.csv
+time_series
+spatial_data
+networks
+notebooks
+
+results
diff --git a/config.yml b/config.yml
@@ -88,17 +88,17 @@ turbine_params:
 extendable_techs:  [
       # 'CCAvgCF', 
       # 'CTAvgCF', 
-      'Biopower', 
-      'Land-Based Wind',
-      'Utility PV', 
+      # 'Biopower', 
+      # 'Land-Based Wind',
+      # 'Utility PV', 
       # 'IGCCAvgCF', 
-      'LWR',
-      'NuclearSMR', 
-      '10Hr Battery Storage', 
-      '8Hr Battery Storage',
-      '6Hr Battery Storage', 
-      '4Hr Battery Storage', 
-      '2Hr Battery Storage'
+      # 'LWR',
+      # 'NuclearSMR', 
+      # '10Hr Battery Storage', 
+      # '8Hr Battery Storage',
+      # '6Hr Battery Storage', 
+      # '4Hr Battery Storage', 
+      # '2Hr Battery Storage'
       ]
 
 carrier_colors:

diff --git a/data/il_rto_zones.csv b/data/il_rto_zones.csv
diff --git a/data/miso_demand.csv b/data/miso_demand.csv