Merge remote-tracking branch 'origin/master'

romainsacchi · Oct 13, 2024 · c173206 · c173206
2 parents d7ca2c3 + b4429fb
commit c173206
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 28 deletions.
diff --git a/carculator_bus/inventory.py b/carculator_bus/inventory.py
@@ -377,9 +377,7 @@ def fill_in_A_matrix(self):
             np.ix_(
                 np.arange(self.iterations),
                 self.find_input_indices(
-                    (
-                        "EV charger, level 3, with pantograph, 450 kW",
-                    )
+                    ("EV charger, level 3, with pantograph, 450 kW",)
                 ),
                 self.find_input_indices(
                     contains=(f"transport, {self.vm.vehicle_type}", "BEV-opp")
@@ -407,9 +405,7 @@ def fill_in_A_matrix(self):
             self.A[
                 np.ix_(
                     np.arange(self.iterations),
-                    self.find_input_indices(
-                        ("catenary system",)
-                    ),
+                    self.find_input_indices(("catenary system",)),
                     self.find_input_indices(
                         contains=(f"transport, {self.vm.vehicle_type}", "BEV-motion")
                     ),

diff --git a/carculator_bus/model.py b/carculator_bus/model.py
@@ -578,39 +578,39 @@ def calculate_ttw_energy(self):
         )
 
         self["TtW energy"] = (
-                self.energy.sel(
-                    parameter=[
-                        "motive energy",
-                        "auxiliary energy",
-                        "cooling energy",
-                        "heating energy",
-                        "battery cooling energy",
-                        "battery heating energy",
-                    ]
-                ).sum(dim=["second", "parameter"])
-                / distance
+            self.energy.sel(
+                parameter=[
+                    "motive energy",
+                    "auxiliary energy",
+                    "cooling energy",
+                    "heating energy",
+                    "battery cooling energy",
+                    "battery heating energy",
+                ]
+            ).sum(dim=["second", "parameter"])
+            / distance
         ).T
 
         # saved_TtW_energy_by_recuperation = recuperated energy
         # * electric motor efficiency * electric transmission efficiency
         # / (engine efficiency * transmission efficiency)
 
         self["TtW energy"] += (
-                (
-                        self.energy.sel(parameter="recuperated energy").sum(dim="second")
-                        / distance
-                ).T
-                * self.array.sel(parameter="engine efficiency")
-                * self.array.sel(parameter="transmission efficiency")
-                / (
-                        self["engine efficiency"]
-                        * self["transmission efficiency"]
-                        * np.where(
+            (
+                self.energy.sel(parameter="recuperated energy").sum(dim="second")
+                / distance
+            ).T
+            * self.array.sel(parameter="engine efficiency")
+            * self.array.sel(parameter="transmission efficiency")
+            / (
+                self["engine efficiency"]
+                * self["transmission efficiency"]
+                * np.where(
                     self["fuel cell system efficiency"] == 0,
                     1,
                     self["fuel cell system efficiency"],
                 )
-                )
+            )
         )
 
         self["TtW energy, combustion mode"] = self["TtW energy"] * (