Fix energy density values

polca · Aug 6, 2024 · 230a6af · 230a6af
1 parent 8f3fb9e
commit 230a6af
Show file tree

Hide file tree

Showing 4 changed files with 12 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/heat.py b/premise/heat.py
@@ -155,7 +155,6 @@ def regionalize_heat_production(self):
 
                 created_datasets.append(dataset["name"])
 
-                print(heat_tech, dataset["name"])
                 geo_mapping = None
                 if heat_tech == "heat, from natural gas (market)":
                     geo_mapping = {

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
                         ),
                     }

diff --git a/tests/test_process_ei310_cutoff_datapackage.py b/tests/test_process_ei310_cutoff_datapackage.py
@@ -53,8 +53,7 @@ def test_brightway():
     ndb.write_datapackage(name="datapackage")
 
     # check existence of files
-    # current working directory / export / datapackage
-    assert os.path.exists("export/datapackage/datapackage.zip")
+    assert os.path.exists("datapackage.zip")
 
     # destroy all objects
     del ndb