Merge remote-tracking branch 'origin/master'

polca · Dec 10, 2023 · db89d0e · db89d0e
2 parents 22f69c5 + a76bb8f
commit db89d0e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/premise/fuels.py b/premise/fuels.py
@@ -2310,7 +2310,13 @@ def generate_fuel_markets(self):
         d_fuels = self.get_fuel_mapping()
 
         vars_map = {
-            "petrol, low-sulfur": ["petrol", "ethanol", "methanol", "gasoline", "bioethanol"],
+            "petrol, low-sulfur": [
+                "petrol",
+                "ethanol",
+                "methanol",
+                "gasoline",
+                "bioethanol",
+            ],
             "diesel, low-sulfur": ["diesel", "biodiesel"],
             "natural gas": ["natural gas", "biomethane"],
             "hydrogen": ["hydrogen"],

diff --git a/premise/steel.py b/premise/steel.py
@@ -201,12 +201,16 @@ def create_steel_markets(self):
                 steel_markets = {
                     loc: dataset
                     for loc, dataset in steel_markets.items()
-                    if (self.iam_data.production_volumes.sel(
-                        region=loc, variables=["steel - primary", "steel - secondary"]
+                    if (
+                        self.iam_data.production_volumes.sel(
+                            region=loc,
+                            variables=["steel - primary", "steel - secondary"],
+                        )
+                        .interp(year=self.year)
+                        .sum(dim="variables")
+                        > 0
+                        or loc == "World"
                     )
-                    .interp(year=self.year)
-                    .sum(dim="variables")
-                    > 0 or loc == "World")
                 }
             else:
                 for loc, dataset in steel_markets.items():