Fix uncertainty values in battery datasets.

polca · Aug 5, 2024 · c8c02dd · c8c02dd
1 parent 02be4c1
commit c8c02dd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/premise/battery.py b/premise/battery.py
@@ -237,7 +237,7 @@ def adjust_battery_mass(self) -> None:
                         [mean_2020_energy_density, mean_2050_energy_density],
                     ),
                     0,
-                    1,
+                    None,
                 )
 
                 scaling_factor_min = minimum_2020_energy_density / np.clip(
@@ -247,7 +247,7 @@ def adjust_battery_mass(self) -> None:
                         [minimum_2020_energy_density, minimum_2050_energy_density],
                     ),
                     0,
-                    1,
+                    None,
                 )
 
                 scaling_factor_max = maximum_2020_energy_density / np.clip(
@@ -257,7 +257,7 @@ def adjust_battery_mass(self) -> None:
                         [maximum_2020_energy_density, maximum_2050_energy_density],
                     ),
                     0,
-                    1,
+                    None,
                 )
 
                 if "log parameters" not in ds:

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/battery/energy_density.yaml b/premise/data/battery/energy_density.yaml
@@ -204,7 +204,7 @@ Li-S:
       # value for 2050 from https://www.nature.com/articles/s41560-020-00748-8/figures/1
       2050:
         mean: 0.340
-        minimum: 0.185
+        minimum: 0.270
         maximum: 0.500
 
 SiB:
@@ -221,8 +221,8 @@ SiB:
       # future values from https://doi.org/10.3390/batteries9070379.
       2050:
         mean: 0.200
-        minimum: 0.160
-        maximum: 0.220
+        minimum: 0.150
+        maximum: 0.230
 
 VRFB:
   ecoinvent_aliases:

diff --git a/premise/transformation.py b/premise/transformation.py
@@ -1068,22 +1068,22 @@ def relink_datasets(self, excludes_datasets=None, alt_names=None):
                             "uncertainty type": exc.get("uncertainty type", 0),
                             "loc": (
                                 exc.get("loc", 0) / exc["amount"]
-                                if exc.get("loc")
+                                if exc.get("loc", None) is not None
                                 else None
                             ),
                             "scale": (
                                 exc.get("scale", 0) / exc["amount"]
-                                if exc.get("scale")
+                                if exc.get("scale", None) is not None
                                 else None
                             ),
                             "minimum": (
                                 exc.get("minimum", 0) / exc["amount"]
-                                if exc.get("minimum")
+                                if exc.get("minimum", None) is not None
                                 else None
                             ),
                             "maximum": (
                                 exc.get("maximum", 0) / exc["amount"]
-                                if exc.get("maximum")
+                                if exc.get("maximum", None) is not None
                                 else None
                             ),
                         }
@@ -1994,22 +1994,22 @@ def relink_technosphere_exchanges(
                         "uncertainty type": exc.get("uncertainty type", 0),
                         "loc": (
                             exc.get("loc", 0) / exc["amount"]
-                            if exc.get("loc")
+                            if exc.get("loc", None) is not None
                             else None
                         ),
                         "scale": (
                             exc.get("scale", 0) / exc["amount"]
-                            if exc.get("scale")
+                            if exc.get("scale", None) is not None
                             else None
                         ),
                         "minimum": (
                             exc.get("minimum", 0) / exc["amount"]
-                            if exc.get("minimum")
+                            if exc.get("minimum", None) is not None
                             else None
                         ),
                         "maximum": (
                             exc.get("maximum", 0) / exc["amount"]
-                            if exc.get("maximum")
+                            if exc.get("maximum", None) is not None
                             else None
                         ),
                     }