Skip to content

Commit 6949d89

Browse files
committed
Fix more future warnings
1 parent 056df4a commit 6949d89

2 files changed

Lines changed: 12 additions & 7 deletions

File tree

src/muse/filters.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,7 @@ def initialize_from_assets(
489489
if "asset" not in agent.assets.dims or len(agent.assets.asset) == 0:
490490
return replacement
491491

492-
assets = (
493-
xr.ones_like(reduce_assets(agent.assets.asset, coords=coords), dtype=bool)
494-
.rename(technology="asset")
495-
.set_index()
496-
)
492+
assets = xr.ones_like(
493+
reduce_assets(agent.assets.asset, coords=coords), dtype=bool
494+
).set_index(asset="technology")
497495
return (assets * replacement).transpose("asset", "replacement")

src/muse/utilities.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@ def operation(x):
150150

151151
# Concatenate assets if a sequence is given
152152
if not isinstance(assets, (xr.Dataset, xr.DataArray)):
153-
assets = xr.concat(assets, dim=dim, join="outer")
153+
assets = xr.concat(
154+
assets, dim=dim, join="outer", coords="different", compat="equals"
155+
)
154156
assert isinstance(assets, (xr.Dataset, xr.DataArray))
155157

156158
# If there are no assets, nothing needs to be done
@@ -584,7 +586,12 @@ def agent_concatenation(
584586
else:
585587
datum[name] = key
586588
result = xr.concat(
587-
data.values(), dim=dim, join="outer", coords="different", compat="equals"
589+
data.values(),
590+
dim=dim,
591+
join="outer",
592+
coords="different",
593+
compat="equals",
594+
data_vars="all",
588595
)
589596
if isinstance(result, xr.Dataset):
590597
result = result.set_coords("agent")

0 commit comments

Comments
 (0)