Skip to content

Commit

Permalink
Black reformating
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed May 19, 2022
1 parent ad40b29 commit 3c3918d
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions carculator_truck/model.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import numexpr as ne
import numpy as np
import xarray as xr
from prettytable import PrettyTable
import yaml
from prettytable import PrettyTable

from . import DATA_DIR
from .background_systems import BackgroundSystemModel
from .driving_cycles import get_standard_driving_cycle
from .energy_consumption import EnergyConsumptionModel
from .hot_emissions import HotEmissionsModel
from .noise_emissions import NoiseEmissionsModel
from .particulates_emissions import ParticulatesEmissionsModel
from . import DATA_DIR

CARGO_MASSES = DATA_DIR / "payloads.yaml"

Expand Down Expand Up @@ -349,15 +349,16 @@ def set_all(self):

def set_cargo_mass_and_annual_mileage(self):

with open(
CARGO_MASSES, "r", encoding="utf-8"
) as stream:
with open(CARGO_MASSES, "r", encoding="utf-8") as stream:
payload = yaml.safe_load(stream)

for s in self.array.coords["size"].values:
self.array.loc[dict(size=s, parameter="total cargo mass")] = payload["payload"][self.cycle][s]
self.array.loc[dict(size=s, parameter="kilometers per year")] = payload["annual mileage"][self.cycle][s]

self.array.loc[dict(size=s, parameter="total cargo mass")] = payload[
"payload"
][self.cycle][s]
self.array.loc[dict(size=s, parameter="kilometers per year")] = payload[
"annual mileage"
][self.cycle][s]

def set_battery_size(self):

Expand All @@ -372,7 +373,7 @@ def set_battery_size(self):
chemistry = "NMC"

if pt in self.energy_storage["electric"]:
chemistry = self.energy_storage['electric'][pt].split('-')[0].strip()
chemistry = self.energy_storage["electric"][pt].split("-")[0].strip()

self.array.loc[
dict(powertrain=pt, parameter="battery cell energy density")
Expand Down

0 comments on commit 3c3918d

Please sign in to comment.