Merge pull request #252 from ccomb/water_well

Water lake and missing geodata
brightway-lca · Mar 8, 2024 · 375bb5b · 375bb5b
2 parents 94de858 + d577657
commit 375bb5b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/bw2io/data/lci/geodata.json b/bw2io/data/lci/geodata.json
@@ -58,6 +58,8 @@
     "BR-MG",
     "BR-MS",
     "BR-MT",
+    "BR-Mid-western grid",
+    "BR-Mid-western",
     "BR-North-eastern grid",
     "BR-Northern grid",
     "BR-PA",
@@ -74,6 +76,8 @@
     "BR-SE",
     "BR-SP",
     "BR-South-eastern and Mid-western grid",
+    "BR-South-eastern grid",
+    "BR-South-eastern",
     "BR-Southern grid",
     "BR-TO",
     "BS",
@@ -149,8 +153,8 @@
     "CX",
     "CY",
     "CZ",
-    "Canada without Alberta",
     "Canada without Alberta and Quebec",
+    "Canada without Alberta",
     "Canada without Quebec",
     "Canary Islands",
     "Central Asia",
@@ -173,9 +177,12 @@
     "ER",
     "ES",
     "ET",
+    "EU27 & EFTA",
+    "Europe without Austria",
     "Europe without NORDEL (NCPA)",
-    "Europe without Switzerland",
+    "Europe without Switzerland and Austria",
     "Europe without Switzerland and France",
+    "Europe without Switzerland",
     "Europe, without Russia and Turkey",
     "FI",
     "FJ",
@@ -221,8 +228,13 @@
     "IAI Area 4&5, without China",
     "IAI Area 6, Europe",
     "IAI Area 8, Gulf",
+    "IAI Area, Africa",
+    "IAI Area, Asia, without China and GCC",
     "IAI Area, EU27 & EFTA",
     "IAI Area, Europe outside EU & EFTA",
+    "IAI Area, Gulf Cooperation Council",
+    "IAI Area, Russia & RER w/o EU27 & EFTA",
+    "IAI Area, South America",
     "ID",
     "IE",
     "IL",
@@ -362,11 +374,12 @@
     "RAF",
     "RAS",
     "RE",
-    "RER",
     "RER w/o AT+BE+CH+DE+FR+IT",
     "RER w/o CH+DE",
     "RER w/o DE+NL+NO",
     "RER w/o DE+NL+NO+RU",
+    "RER w/o RU",
+    "RER",
     "RFC",
     "RLA",
     "RME",
@@ -376,6 +389,7 @@
     "RU",
     "RW",
     "RoW",
+    "Russia & RER w/o EU27 & EFTA",
     "Russia (Asia)",
     "Russia (Europe)",
     "SA",
@@ -426,10 +440,10 @@
     "TW",
     "TZ",
     "UA",
-    "UCTE",
     "UCTE without France",
-    "UCTE without Germany",
     "UCTE without Germany and France",
+    "UCTE without Germany",
+    "UCTE",
     "UG",
     "UM",
     "UN-AMERICAS",
@@ -454,6 +468,7 @@
     "UN-SEUROPE",
     "UN-WAFRICA",
     "UN-WASIA",
+    "US only",
     "US",
     "UY",
     "UZ",

diff --git a/bw2io/strategies/simapro.py b/bw2io/strategies/simapro.py
@@ -581,6 +581,7 @@ def fix_localized_water_flows(db):
         "Water",
         "Water, cooling, unspecified natural origin",
         "Water, river",
+        "Water, lake",
         "Water, turbine use, unspecified natural origin",
         "Water, unspecified natural origin",
         "Water, well, in ground",