Merge remote-tracking branch 'origin/master'

polca · Jul 17, 2024 · 7cbdd02 · 7cbdd02
2 parents 8f8ba94 + 6ae846c
commit 7cbdd02
Showing 1 changed file with 25 additions and 9 deletions.
diff --git a/premise/battery.py b/premise/battery.py
@@ -98,7 +98,11 @@ def adjust_battery_mass(self) -> None:
 
         energy_density = load_cell_energy_density()
 
-        filters = [ws.contains("name", x) for x in energy_density if "battery capacity" not in x]
+        filters = [
+            ws.contains("name", x)
+            for x in energy_density
+            if "battery capacity" not in x
+        ]
 
         for ds in ws.get_many(
             self.database,
@@ -111,7 +115,7 @@ def adjust_battery_mass(self) -> None:
                             "battery production",
                             "battery cell production",
                             "cell module production",
-                            "battery capacity"
+                            "battery capacity",
                         ]
                     ]
                 )
@@ -159,15 +163,27 @@ def adjust_battery_mass(self) -> None:
                 if "log parameters" not in ds:
                     ds["log parameters"] = {}
 
-                ds["log parameters"]["battery input"] = [e["name"] for e in ws.technosphere(ds, ws.contains("name", "market for battery"))][0]
-                ds["log parameters"]["old battery mass"] = sum(e["amount"] for e in ws.technosphere(ds, ws.contains("name", "market for battery")))
-
-                rescale_exchanges(
-                    ds,
-                    scaling_factor
+                ds["log parameters"]["battery input"] = [
+                    e["name"]
+                    for e in ws.technosphere(
+                        ds, ws.contains("name", "market for battery")
+                    )
+                ][0]
+                ds["log parameters"]["old battery mass"] = sum(
+                    e["amount"]
+                    for e in ws.technosphere(
+                        ds, ws.contains("name", "market for battery")
+                    )
                 )
 
-                ds["log parameters"]["new battery mass"] = sum(e["amount"] for e in ws.technosphere(ds, ws.contains("name", "market for battery")))
+                rescale_exchanges(ds, scaling_factor)
+
+                ds["log parameters"]["new battery mass"] = sum(
+                    e["amount"]
+                    for e in ws.technosphere(
+                        ds, ws.contains("name", "market for battery")
+                    )
+                )
 
                 self.write_log(ds, status="modified")