diff --git a/carculator_truck/model.py b/carculator_truck/model.py index f57b8e3..cad68b6 100644 --- a/carculator_truck/model.py +++ b/carculator_truck/model.py @@ -392,13 +392,13 @@ def calculate_ttw_energy(self): ) self["TtW energy"] = ( - self.energy.sel( - parameter=[ - "motive energy", - "auxiliary energy", - ] - ).sum(dim=["second", "parameter"]) - / distance + self.energy.sel( + parameter=[ + "motive energy", + "auxiliary energy", + ] + ).sum(dim=["second", "parameter"]) + / distance ).T # saved_TtW_energy_by_recuperation = recuperated energy @@ -406,21 +406,21 @@ def calculate_ttw_energy(self): # / (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"] * (