Merge remote-tracking branch 'origin/master'

romainsacchi · Feb 2, 2023 · 9a6087e · 9a6087e
2 parents b7f6e50 + 61131ab
commit 9a6087e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/carculator_utils/hot_emissions.py b/carculator_utils/hot_emissions.py
@@ -250,7 +250,6 @@ def get_hot_emissions(
             },
         )
 
-
         # bit of a manual calibration for N2O and NH3
         # as they do not correlate with fuel consumption
 
@@ -402,7 +401,9 @@ def get_hot_emissions(
 
         engine_wear = self.engine_wear.sel(
             powertrain=[
-                MAP_PWT[pt] if MAP_PWT[pt] in self.engine_wear.powertrain.values else "BEV"
+                MAP_PWT[pt]
+                if MAP_PWT[pt] in self.engine_wear.powertrain.values
+                else "BEV"
                 for pt in emissions.powertrain.values
             ]
         )
@@ -477,8 +478,8 @@ def get_hot_emissions(
 
         res = xr.DataArray(
             np.concatenate(
-            (urban_emissions, rural_emissions, highway_emissions), axis=-1
-        ),
+                (urban_emissions, rural_emissions, highway_emissions), axis=-1
+            ),
             coords=[
                 emissions.coords["value"],
                 emissions.coords["year"],

diff --git a/carculator_utils/model.py b/carculator_utils/model.py
@@ -731,7 +731,7 @@ def create_PHEV(self):
                             "recuperation efficiency",
                             "charger mass",
                             "inverter mass",
-                            "power distribution unit mass"
+                            "power distribution unit mass",
                         ],
                         powertrain=pwt,
                     )
@@ -750,7 +750,7 @@ def create_PHEV(self):
                             "recuperation efficiency",
                             "charger mass",
                             "inverter mass",
-                            "power distribution unit mass"
+                            "power distribution unit mass",
                         ],
                         powertrain="PHEV-e",
                     )
@@ -776,7 +776,6 @@ def create_PHEV(self):
                     ]
                 )
 
-
                 self.array.loc[
                     dict(parameter="TtW energy, combustion mode", powertrain=pwt)
                 ] = self.array.loc[dict(parameter="TtW energy", powertrain=pwtc)]