From da31bd5c80d242c18cdd14be6789b9722a75bf0b Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Wed, 17 Nov 2021 11:34:17 +0000 Subject: [PATCH] Black reformating --- carculator_truck/inventory.py | 16 ++--- carculator_truck/model.py | 121 ++++++++++++++++++++++------------ 2 files changed, 84 insertions(+), 53 deletions(-) diff --git a/carculator_truck/inventory.py b/carculator_truck/inventory.py index c2651b3..936339e 100644 --- a/carculator_truck/inventory.py +++ b/carculator_truck/inventory.py @@ -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" @@ -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, " @@ -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" diff --git a/carculator_truck/model.py b/carculator_truck/model.py index b57da95..837250f 100644 --- a/carculator_truck/model.py +++ b/carculator_truck/model.py @@ -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"}, @@ -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"] @@ -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 @@ -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"] @@ -175,7 +186,9 @@ def __init__( if s in self.array.coords["size"].values ], ) - ] *= (1 - 0.33) + ] *= ( + 1 - 0.33 + ) def __call__(self, key): """ @@ -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.") @@ -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, @@ -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, @@ -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) @@ -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 @@ -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)], @@ -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")] @@ -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"] = ( ( @@ -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"} @@ -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, @@ -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"], @@ -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,