Skip to content

Commit

Permalink
Black reformating
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed Aug 31, 2024
1 parent 14155ce commit f4f1178
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions carculator_truck/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,35 +392,35 @@ 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
# * 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"] * (
Expand Down

0 comments on commit f4f1178

Please sign in to comment.