From 929bfa608bb3fcc952ca79ca1ae44478c19fdb09 Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Wed, 21 Aug 2024 16:49:26 +0000 Subject: [PATCH] Black reformating --- premise/transport.py | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/premise/transport.py b/premise/transport.py index 0c425394..3ec3a0f7 100644 --- a/premise/transport.py +++ b/premise/transport.py @@ -92,10 +92,13 @@ def get_battery_size() -> dict: for each vehicle type and powertrain. :return: dictionary with battery sizes """ - with open(DATA_DIR / "transport" / "battery_size.yaml", "r", encoding="utf-8") as stream: + with open( + DATA_DIR / "transport" / "battery_size.yaml", "r", encoding="utf-8" + ) as stream: out = yaml.safe_load(stream) return out + def get_average_truck_load_factors() -> Dict[str, Dict[str, Dict[str, float]]]: """ Load average load factors for trucks @@ -503,7 +506,9 @@ def create_vehicle_markets(self) -> list: ws.equals("unit", "ton kilometer"), ): - new_name = self.mapping["truck"]["old_trucks"][exc["name"]][self.model] + new_name = self.mapping["truck"]["old_trucks"][exc["name"]][ + self.model + ] new_loc = self.geo.ecoinvent_to_iam_location(dataset["location"]) if (new_name, new_loc) in list_created_vehicles: @@ -512,26 +517,30 @@ def create_vehicle_markets(self) -> list: exc["location"] = new_loc else: print(f"Could not find dataset for {new_name} in {new_loc}.") - exc["name"] = "transport, freight, lorry, unspecified, long haul" + exc["name"] = ( + "transport, freight, lorry, unspecified, long haul" + ) exc["product"] = "transport, freight, lorry" exc["location"] = "World" - # also we need to empty the old transport datasets for dataset in ws.get_many( self.database, ws.either( - *[ - ws.equals("name", v) - for v in self.mapping["truck"]["old_trucks"] - ] + *[ws.equals("name", v) for v in self.mapping["truck"]["old_trucks"]] ), ): - dataset["exchanges"] = [e for e in dataset["exchanges"] if e["type"] == "production"] - dataset["comment"] = "This dataset has been replaced by new fleet-average vehicles." + dataset["exchanges"] = [ + e for e in dataset["exchanges"] if e["type"] == "production" + ] + dataset["comment"] = ( + "This dataset has been replaced by new fleet-average vehicles." + ) # add new truck as exchange - new_name = self.mapping["truck"]["old_trucks"][dataset["name"]][self.model] + new_name = self.mapping["truck"]["old_trucks"][dataset["name"]][ + self.model + ] new_loc = self.geo.ecoinvent_to_iam_location(dataset["location"]) if (new_name, new_loc) in list_created_vehicles: @@ -622,9 +631,13 @@ def adjust_battery_size(self, ds): size = [s for s in self.battery_size["truck"] if s in ds["name"]][0] if self.year < min(self.battery_size["truck"][size].keys()): - battery_size = self.battery_size["truck"][size][min(self.battery_size["truck"][size].keys())] + battery_size = self.battery_size["truck"][size][ + min(self.battery_size["truck"][size].keys()) + ] elif self.year > max(self.battery_size["truck"][size].keys()): - battery_size = self.battery_size["truck"][size][max(self.battery_size["truck"][size].keys())] + battery_size = self.battery_size["truck"][size][ + max(self.battery_size["truck"][size].keys()) + ] else: battery_size = np.interp( self.year, @@ -637,8 +650,6 @@ def adjust_battery_size(self, ds): ds["comment"] += f" Battery size adjusted to {battery_size} kWh." - - def write_log(self, dataset, status="created"): """ Write log file.