Fix uncertainty params for a few datasets.

Created datasets to provide 1 kWh of electricity from stationary batteries. Renamed product of battery markets to "electricity storage capacity".
polca · Aug 5, 2024 · 4a99443 · 4a99443
1 parent 16dc032
commit 4a99443
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 14 deletions.
diff --git a/premise/data/additional_inventories/lci-battery-capacity.xlsx b/premise/data/additional_inventories/lci-battery-capacity.xlsx
diff --git a/premise/data/additional_inventories/lci-buses.xlsx b/premise/data/additional_inventories/lci-buses.xlsx
diff --git a/premise/data/additional_inventories/lci-carbon-capture.xlsx b/premise/data/additional_inventories/lci-carbon-capture.xlsx
diff --git a/premise/data/additional_inventories/lci-pass_cars.xlsx b/premise/data/additional_inventories/lci-pass_cars.xlsx
diff --git a/premise/data/additional_inventories/lci-trucks.xlsx b/premise/data/additional_inventories/lci-trucks.xlsx
diff --git a/premise/data/additional_inventories/lci-two_wheelers.xlsx b/premise/data/additional_inventories/lci-two_wheelers.xlsx
diff --git a/premise/electricity.py b/premise/electricity.py
@@ -1550,7 +1550,7 @@ def create_region_specific_power_plants(self):
             ws.either(
                 *[ws.contains("name", name) for name in list_datasets_to_duplicate]
             ),
-            # ws.exclude(ws.contains("name", "market")),
+            ws.exclude(ws.contains("name", "market")),
             ws.exclude(ws.contains("name", ", oxy, ")),
             ws.exclude(ws.contains("name", ", pre, ")),
         ):

diff --git a/premise/iam_variables_mapping/electricity_variables.yaml b/premise/iam_variables_mapping/electricity_variables.yaml
@@ -902,7 +902,7 @@ Solar PV Residential:
 Storage, Battery:
   ecoinvent_aliases:
     fltr:
-      - market for battery capacity, stationary (CONT scenario)
+      - electricity supply, from stationary battery (CONT scenario)
   iam_aliases:
     image: Secondary Energy|Electricity|Storage
     message: Secondary Energy|Electricity|Storage

diff --git a/premise/inventory_imports.py b/premise/inventory_imports.py
@@ -262,22 +262,20 @@ def check_uncertainty_data(data, filename):
                     exc["uncertainty type"] = 0
 
                 if exc["uncertainty type"] not in {0, 1}:
-                    if not all(
-                        f in exc
-                        for f in MANDATORY_UNCERTAINTY_FIELDS[exc["uncertainty type"]]
-                    ):
+                    missing_parameters = [
+                        f
+                        for f in MANDATORY_UNCERTAINTY_FIELDS[
+                            exc["uncertainty type"]
+                        ]
+                        if exc.get(f) is None
+                    ]
+                    if missing_parameters:
                         rows.append(
                             [
                                 dataset["name"][:30],
                                 exc["name"][:30],
                                 exc["uncertainty type"],
-                                [
-                                    f
-                                    for f in MANDATORY_UNCERTAINTY_FIELDS[
-                                        exc["uncertainty type"]
-                                    ]
-                                    if f not in exc
-                                ],
+                                missing_parameters
                             ]
                         )
 
@@ -294,7 +292,7 @@ def check_uncertainty_data(data, filename):
                             ]
                         )
 
-                    if not exc["minimum"] <= exc["loc"] <= exc["maximum"]:
+                    if not exc.get("minimum", 0) <= exc.get("loc", 0) <= exc.get("maximum", 0):
                         rows.append(
                             [
                                 dataset["name"][:30],