From 8f73a101a352e60660fbc38f25d388326baf950b Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Wed, 17 Nov 2021 19:41:38 +0000 Subject: [PATCH] Black reformating --- carculator_truck/model.py | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/carculator_truck/model.py b/carculator_truck/model.py index bbee157..b9cd5c9 100644 --- a/carculator_truck/model.py +++ b/carculator_truck/model.py @@ -83,7 +83,9 @@ def __init__( } l_pwt = [ - pt for pt in ("BEV", "FCEV", "HEV-d", "PHEV-e") if pt in self.array.powertrain.values + pt + for pt in ("BEV", "FCEV", "HEV-d", "PHEV-e") + if pt in self.array.powertrain.values ] for pt in l_pwt: @@ -720,7 +722,6 @@ def calculate_ttw_energy(self): # as documented in # https://www.research-collection.ethz.ch/bitstream/handle/20.500.11850/121450/1/2539-07.pdf - l_pwt = [ p for p in self.array.powertrain.values @@ -772,9 +773,15 @@ def calculate_ttw_energy(self): ] if len(l_pwt) > 0: self.energy.loc[ - dict(parameter=["engine efficiency", "transmission efficiency"], powertrain=l_pwt) + dict( + parameter=["engine efficiency", "transmission efficiency"], + powertrain=l_pwt, + ) ] = self.array.loc[ - dict(parameter=["engine efficiency", "transmission efficiency"], powertrain=l_pwt) + dict( + parameter=["engine efficiency", "transmission efficiency"], + powertrain=l_pwt, + ) ].values[ ..., None ] @@ -884,11 +891,15 @@ def calculate_ttw_energy(self): axis=-1, ) - self.array.loc[dict(parameter="transmission efficiency", powertrain=pwt)] = np.nanmean( + self.array.loc[ + dict(parameter="transmission efficiency", powertrain=pwt) + ] = np.nanmean( np.where( self.energy.loc[dict(parameter="power load", powertrain=pwt)] == 0, np.nan, - self.energy.loc[dict(parameter="transmission efficiency", powertrain=pwt)], + self.energy.loc[ + dict(parameter="transmission efficiency", powertrain=pwt) + ], ), axis=-1, ) @@ -982,7 +993,8 @@ def set_battery_fuel_cell_replacements(self): ]: with self(pt) as cpm: battery_tech_label = ( - "battery cycle life, " + self.energy_storage["electric"][pt].split("-")[0] + "battery cycle life, " + + self.energy_storage["electric"][pt].split("-")[0] ) cpm["battery lifetime replacements"] = finite( np.ceil( @@ -1393,15 +1405,15 @@ def set_energy_stored_properties(self): ) cpm["battery cell mass"] = ( - cpm["electric energy stored"] / cpm[battery_tech_label] + cpm["electric energy stored"] / cpm[battery_tech_label] ) cpm["energy battery mass"] = ( - cpm["battery cell mass"] / cpm["battery cell mass share"] + cpm["battery cell mass"] / cpm["battery cell mass share"] ) cpm["battery BoP mass"] = ( - cpm["energy battery mass"] - cpm["battery cell mass"] + cpm["energy battery mass"] - cpm["battery cell mass"] ) # kWh electricity/kg battery cell