Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
romainsacchi committed Jun 28, 2024
2 parents 201f9ea + 4301b65 commit 3e6f50f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
9 changes: 6 additions & 3 deletions premise/fuels.py
Original file line number Diff line number Diff line change
Expand Up @@ -2251,11 +2251,14 @@ def generate_regional_fuel_market(
if np.isclose(
self.iam_fuel_markets.sel(region=region, variables=prod_vars)
.interp(year=self.year)
.sum(dim=["variables"])
, 0, atol=1e-3
.sum(dim=["variables"]),
0,
atol=1e-3,
):
if "hydrogen" in dataset["name"].lower():
prod_vars = ["hydrogen, from natural gas",]
prod_vars = [
"hydrogen, from natural gas",
]

sum_share = 0
for prod_var in prod_vars:
Expand Down
4 changes: 1 addition & 3 deletions premise/transformation.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,7 @@ def select_multiple_suppliers(
suppliers = list(
ws.get_many(
subset or self.database,
ws.either(
*[ws.equals("name", sup) for sup in possible_names]
),
ws.either(*[ws.equals("name", sup) for sup in possible_names]),
(
ws.either(
*[
Expand Down

0 comments on commit 3e6f50f

Please sign in to comment.