Skip to content

Commit

Permalink
Black reformating
Browse files Browse the repository at this point in the history
  • Loading branch information
@romainsacchi
romainsacchi committed Nov 17, 2021
1 parent 362097c commit da31bd5
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 53 deletions.
16 changes: 5 additions & 11 deletions carculator_truck/inventory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1671,12 +1671,10 @@ def add_additional_activities(self):
if pt == "BEV":

chemistry = self.background_configuration["energy storage"][
"electric"
]["BEV"]
"electric"
]["BEV"]

name = (
f"transport, freight, lorry, {pt}, {chemistry} battery, {s} gross weight, {y}, {self.cycle.lower()}"
)
name = f"transport, freight, lorry, {pt}, {chemistry} battery, {s} gross weight, {y}, {self.cycle.lower()}"

if self.scope["fu"]["unit"] == "tkm":
unit = "ton-kilometer"
Expand All @@ -1694,9 +1692,7 @@ def add_additional_activities(self):

elif pt == "FCEV":

name = (
f"transport, freight, lorry, {pt}, {s} gross weight, {y}, {self.cycle.lower()}"
)
name = f"transport, freight, lorry, {pt}, {s} gross weight, {y}, {self.cycle.lower()}"

name = (
"transport, freight, lorry, "
Expand Down Expand Up @@ -1725,9 +1721,7 @@ def add_additional_activities(self):

else:

name = (
f"transport, freight, lorry, {pt}, {s} gross weight, {y}, {euro_class}, {self.cycle.lower()}"
)
name = f"transport, freight, lorry, {pt}, {s} gross weight, {y}, {euro_class}, {self.cycle.lower()}"

if self.scope["fu"]["unit"] == "tkm":
unit = "ton-kilometer"
Expand Down
121 changes: 79 additions & 42 deletions carculator_truck/model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@

DEFAULT_MAPPINGS = {
"electric": {"BEV", "PHEV-e"},
"combustion": {"HEV-d", "ICEV-g", "ICEV-d", "PHEV-c-d",},
"combustion": {
"HEV-d",
"ICEV-g",
"ICEV-d",
"PHEV-c-d",
},
"combustion_wo_cng": {"HEV-d", "ICEV-d", "PHEV-c-d"},
"pure_combustion": {"ICEV-g", "ICEV-d"},
"petrol": {"PHEV-c-p"},
Expand Down Expand Up @@ -129,7 +134,9 @@ def __init__(
if s in self.array.coords["size"].values
],
)
] *= (1 - 0.67)
] *= (
1 - 0.67
)

if any(
s in self.array.coords["size"].values for s in ["32t", "40t", "60t"]
Expand All @@ -143,7 +150,9 @@ def __init__(
if s in self.array.coords["size"].values
],
)
] *= (1 - 0.33)
] *= (
1 - 0.33
)

if self.cycle == "Urban delivery":
self.array.loc[dict(parameter="kilometers per year")] *= 1 - 0.39
Expand All @@ -161,7 +170,9 @@ def __init__(
if s in self.array.coords["size"].values
],
)
] *= (1 - 0.67)
] *= (
1 - 0.67
)

if any(
s in self.array.coords["size"].values for s in ["32t", "40t", "60t"]
Expand All @@ -175,7 +186,9 @@ def __init__(
if s in self.array.coords["size"].values
],
)
] *= (1 - 0.33)
] *= (
1 - 0.33
)

def __call__(self, key):
"""
Expand Down Expand Up @@ -296,7 +309,6 @@ def set_all(self):

self.array.values = np.clip(self.array.values, 0, None)


print("")
print("'-' BEV with driving mass superior to the permissible gross weight.")
print("'*' ICEV that do not comply with the set energy reduction target.")
Expand Down Expand Up @@ -446,13 +458,16 @@ def adjust_combustion_power_share(self):
)

if arr.sum() > 0:
new_shares = self.array.loc[
dict(
powertrain=l_pwt,
parameter="combustion power share",
year=actual_years,
)
] - (arr * 0.02)
new_shares = (
self.array.loc[
dict(
powertrain=l_pwt,
parameter="combustion power share",
year=actual_years,
)
]
- (arr * 0.02)
)
self.array.loc[
dict(
powertrain=l_pwt,
Expand Down Expand Up @@ -540,7 +555,11 @@ def adjust_cost(self):
# Correction of combustion powertrain cost for ICEV-g
if "ICEV-g" in self.array.powertrain.values:
self.array.loc[
:, ["ICEV-g"], "combustion powertrain cost per kW", :, :,
:,
["ICEV-g"],
"combustion powertrain cost per kW",
:,
:,
] = np.reshape(
(5.92e160 * np.exp(-0.1819 * self.array.year.values) + 26.76)
* cost_factor,
Expand All @@ -556,7 +575,15 @@ def drop_hybrid(self):
l_pwt = [
p
for p in self.array.powertrain.values
if p in ["ICEV-d", "ICEV-g", "PHEV-d", "FCEV", "BEV", "HEV-d",]
if p
in [
"ICEV-d",
"ICEV-g",
"PHEV-d",
"FCEV",
"BEV",
"HEV-d",
]
]
self.array = self.array.sel(powertrain=l_pwt)

Expand Down Expand Up @@ -650,11 +677,10 @@ def calculate_ttw_energy(self):
if len(l_pwt) > 0:

self.energy.loc[dict(parameter="power load", powertrain=l_pwt)] = (
(motive_power.T[:, idx, ...] + recuperated_power.T[:, idx, ...])
/ self.array.sel(parameter="electric power", powertrain=l_pwt).values[
..., None
]
)
motive_power.T[:, idx, ...] + recuperated_power.T[:, idx, ...]
) / self.array.sel(parameter="electric power", powertrain=l_pwt).values[
..., None
]

self.energy.loc[dict(parameter="power load")] = np.clip(
self.energy.loc[dict(parameter="power load")], 0, 1
Expand All @@ -679,7 +705,10 @@ def calculate_ttw_energy(self):
if len(l_pwt) > 0:

self.energy.loc[
dict(parameter="engine efficiency", powertrain=l_pwt,)
dict(
parameter="engine efficiency",
powertrain=l_pwt,
)
] = np.clip(
np.interp(
self.energy.loc[dict(parameter="power load", powertrain=l_pwt)],
Expand Down Expand Up @@ -707,25 +736,22 @@ def calculate_ttw_energy(self):
if "ICEV-g" in self.array.powertrain.values:
self.energy.loc[
dict(parameter="engine efficiency", powertrain="ICEV-g")
] *= (
1
- self.array.sel(
parameter="CNG engine efficiency correction factor",
powertrain="ICEV-g",
)
] *= 1 - self.array.sel(
parameter="CNG engine efficiency correction factor",
powertrain="ICEV-g",
)

l_pwt = [
p
for p in self.array.powertrain.values
if p in ["BEV", "FCEV", "PHEV-e"]
p for p in self.array.powertrain.values if p in ["BEV", "FCEV", "PHEV-e"]
]
if len(l_pwt) > 0:
self.energy.loc[
dict(parameter="engine efficiency", powertrain=l_pwt)
] = self.array.loc[dict(
parameter="engine efficiency", powertrain=l_pwt
)].values[..., None]
] = self.array.loc[
dict(parameter="engine efficiency", powertrain=l_pwt)
].values[
..., None
]

self.energy.loc[dict(parameter="motive energy")] = (
self.energy.loc[dict(parameter="motive energy at wheels")]
Expand Down Expand Up @@ -1063,7 +1089,7 @@ def set_component_masses(self):
)

def set_share_recuperated_energy(self):
""" Calculate the share of recuperated energy, over the total negative motive energy"""
"""Calculate the share of recuperated energy, over the total negative motive energy"""

self["share recuperated energy"] = (
(
Expand Down Expand Up @@ -1126,12 +1152,11 @@ def create_PHEV(self):
)
)

#self.array.loc[{"powertrain": "PHEV-d", "parameter":[
# self.array.loc[{"powertrain": "PHEV-d", "parameter":[
# "battery cell mass", "battery BoP mass", "energy battery mass"
#]}] = self.array.loc[{"powertrain": "PHEV-e", "parameter":[
# ]}] = self.array.loc[{"powertrain": "PHEV-e", "parameter":[
# "battery cell mass", "battery BoP mass", "energy battery mass"
#]}]

# ]}]

self.array.loc[
{"powertrain": "PHEV-d", "parameter": "electric utility factor"}
Expand Down Expand Up @@ -1683,12 +1708,18 @@ def set_hot_emissions(self):

if len(l_pwt) > 0:
self.array.loc[
dict(powertrain=l_pwt, parameter=list_direct_emissions,)
dict(
powertrain=l_pwt,
parameter=list_direct_emissions,
)
] = hem.get_emissions_per_powertrain(
powertrain_type="diesel",
euro_classes=l_y,
lifetime_km=self.array.loc[
dict(powertrain=l_pwt, parameter="lifetime kilometers",)
dict(
powertrain=l_pwt,
parameter="lifetime kilometers",
)
],
energy_consumption=self.energy.sel(
powertrain=l_pwt,
Expand All @@ -1709,7 +1740,10 @@ def set_hot_emissions(self):
powertrain_type="cng",
euro_classes=l_y,
lifetime_km=self.array.loc[
dict(powertrain="ICEV-g", parameter="lifetime kilometers",)
dict(
powertrain="ICEV-g",
parameter="lifetime kilometers",
)
],
energy_consumption=self.energy.sel(
powertrain=["ICEV-g"],
Expand Down Expand Up @@ -1944,7 +1978,10 @@ def get_share_biofuel(self):

share_biofuel = (
self.bs.biofuel.sel(
region=region, value=0, fuel_type="Biomass fuel", scenario=scenario,
region=region,
value=0,
fuel_type="Biomass fuel",
scenario=scenario,
)
.interp(
year=self.array.coords["year"].values,
Expand Down

0 comments on commit da31bd5

Please sign in to comment.