Merge branch 'master' into vik/workaround_for_BE

electricitymaps · May 29, 2024 · f10569f · f10569f
2 parents a28d430 + be2bc43
commit f10569f
Show file tree

Hide file tree

Showing 67 changed files with 939 additions and 92 deletions.
diff --git a/config/zones/US-CAL-BANC.yaml b/config/zones/US-CAL-BANC.yaml
@@ -44,6 +44,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 325.7
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 327.0
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CAL-CISO.yaml b/config/zones/US-CAL-CISO.yaml
@@ -8,10 +8,22 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 6887.1
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 7985.9
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 8430.5
   biomass:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 993.1
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 970.9
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 970.5
   coal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -20,6 +32,12 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 32732.4
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 31904.0
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 31888.3
   geothermal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -28,10 +46,19 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 6333.6
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 6343.6
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 6149.4
   hydro storage:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 1568.8
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 1877.8
   nuclear:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -40,18 +67,36 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 164.8
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 160.3
   solar:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 19674.0
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 20526.9
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 20969.3
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 66.7
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 62.7
   wind:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 6027.7
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 6123.0
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 6106.5
 comment: California Independent System Operator
 contributors:
   - systemcatch

diff --git a/config/zones/US-CAL-IID.yaml b/config/zones/US-CAL-IID.yaml
@@ -24,6 +24,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 742.7
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 811.7
   hydro:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CAL-LDWP.yaml b/config/zones/US-CAL-LDWP.yaml
@@ -20,6 +20,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 4854.6
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 4631.7
   geothermal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -44,6 +47,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 999.1
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 1000.9
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CAR-CPLE.yaml b/config/zones/US-CAR-CPLE.yaml
@@ -8,10 +8,16 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 23.1
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 41.1
   biomass:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 336.4
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 327.4
   coal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -28,6 +34,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 225.2
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 224.0
   hydro storage:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -44,6 +53,12 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 2853.2
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 2911.6
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 2913.4
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CAR-CPLW.yaml b/config/zones/US-CAR-CPLW.yaml
@@ -37,9 +37,15 @@ capacity:
       source: EIA.gov
       value: 0.0
   oil:
-    - datetime: '2023-10-01'
+    - comment:
+        There has been reported oil generation through the usage of diseal generators
+        during extreme weather events. We do not know yet the capacity of these generators,
+        so we are not able to provide a value.
+      datetime: '2023-10-01'
       value: null
-      comment: There has been reported oil generation through the usage of diseal generators during extreme weather events. We do not know yet the capacity of these generators, so we are not able to provide a value.
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 0.0
   solar:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CAR-DUK.yaml b/config/zones/US-CAR-DUK.yaml
@@ -12,6 +12,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 76.1
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 71.6
   coal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -32,6 +35,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 2358.0
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 2454.0
   nuclear:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -44,6 +50,12 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 2033.6
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 2038.6
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 2063.6
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CAR-SC.yaml b/config/zones/US-CAR-SC.yaml
@@ -44,6 +44,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 248.2
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 303.2
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CAR-SCEG.yaml b/config/zones/US-CAR-SCEG.yaml
@@ -12,6 +12,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 120.0
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 20.8
   coal:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CENT-SPA.yaml b/config/zones/US-CENT-SPA.yaml
@@ -28,6 +28,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 1327.6
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 1253.2
   hydro storage:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -44,6 +47,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 17.0
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 18.5
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-CENT-SWPP.yaml b/config/zones/US-CENT-SWPP.yaml
@@ -8,6 +8,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 26.9
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 25.7
   biomass:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -20,6 +23,12 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 34966.3
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 34976.7
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 34947.2
   geothermal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -40,10 +49,22 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 2053.6
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 2047.3
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 2085.5
   solar:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 588.6
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 596.9
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 606.9
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -52,6 +73,12 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 31745.7
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 32688.6
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 33089.0
 comment: Southwest Power Pool
 contributors:
   - systemcatch

diff --git a/config/zones/US-FLA-FMPP.yaml b/config/zones/US-FLA-FMPP.yaml
@@ -40,6 +40,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 93.8
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 87.8
   solar:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-FLA-FPC.yaml b/config/zones/US-FLA-FPC.yaml
@@ -8,10 +8,16 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 47.6
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 50.1
   biomass:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 257.2
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 184.2
   coal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -20,6 +26,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 10751.1
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 10774.1
   geothermal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -44,6 +53,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 1261.0
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 1414.8
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-FLA-FPL.yaml b/config/zones/US-FLA-FPL.yaml
@@ -44,6 +44,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 4584.8
+    - datetime: '2024-03-01'
+      source: EIA.gov
+      value: 6223.8
   unknown:
     - datetime: '2023-10-01'
       source: EIA.gov

diff --git a/config/zones/US-FLA-HST.yaml b/config/zones/US-FLA-HST.yaml
@@ -20,6 +20,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 35.6
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 33.6
   geothermal:
     - datetime: '2023-10-01'
       source: EIA.gov
@@ -40,6 +43,9 @@ capacity:
     - datetime: '2023-10-01'
       source: EIA.gov
       value: 0.0
+    - datetime: '2023-12-01'
+      source: EIA.gov
+      value: 2.0
   solar:
     - datetime: '2023-10-01'
       source: EIA.gov