Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/muse/agents/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,6 @@ def retirement_profile(
lifetime,
investment_year=investment_year,
)
if "dst_region" in investments.coords:
investments = investments.reindex_like(profile, method="ffill")

# Apply the retirement profile to the investments
new_assets = (investments * profile).rename(replacement="asset")
Expand Down
4 changes: 0 additions & 4 deletions src/muse/agents/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,6 @@ def agents_factory(

if regions and "region" in capacity.dims:
capacity = capacity.sel(region=regions)
if regions and "dst_region" in capacity.dims:
capacity = capacity.sel(dst_region=regions)
if capacity.dst_region.size == 1:
capacity = capacity.squeeze("dst_region", drop=True)
result = []

retrofit_present = False
Expand Down
17 changes: 0 additions & 17 deletions src/muse/constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,6 @@ def max_capacity_expansion(

if b.region.dims == ():
capa = 1
elif "dst_region" in b.dims:
b = b.rename(region="src_region")
capa = search_space.agent.region == b.src_region

return xr.Dataset(
dict(b=b, capacity=capa),
Expand All @@ -385,8 +382,6 @@ def demand(

enduse = technologies.commodity.sel(commodity=is_enduse(technologies.comm_usage))
b = demand.sel(commodity=demand.commodity.isin(enduse))
if "region" in b.dims and "dst_region" in technologies.dims:
b = b.rename(region="dst_region")
assert "year" not in b.dims
return xr.Dataset(
dict(b=b, production=1), attrs=dict(kind=ConstraintKind.LOWER_BOUND)
Expand Down Expand Up @@ -451,18 +446,6 @@ def max_production(
capa = capa.expand_dims(asset=search_space.asset)
production = ones_like(capa)
b = zeros_like(production)
# Include maxaddition constraint in max production to match region-dst_region
if "dst_region" in technologies.dims:
b = b.expand_dims(dst_region=technologies.dst_region)
capa = capa.rename(region="src_region")
production = production.rename(region="src_region")
maxadd = technologies.max_capacity_addition.rename(region="src_region")
maxadd = maxadd.rename(technology="replacement")
maxadd = maxadd.where(maxadd == 0, 0.0)
maxadd = maxadd.where(maxadd > 0, -1.0)
capa = capa * broadcast_timeslice(maxadd, level=timeslice_level)
production = production * broadcast_timeslice(maxadd, level=timeslice_level)
b = b.rename(region="src_region")
return xr.Dataset(
dict(capacity=-cast(np.ndarray, capa), production=production, b=b),
attrs=dict(kind=ConstraintKind.UPPER_BOUND),
Expand Down
6 changes: 0 additions & 6 deletions src/muse/data/example/trade/input/GlobalCommodities.csv

This file was deleted.

40 changes: 0 additions & 40 deletions src/muse/data/example/trade/input/Projections.csv

This file was deleted.

128 changes: 0 additions & 128 deletions src/muse/data/example/trade/settings.toml

This file was deleted.

3 changes: 0 additions & 3 deletions src/muse/data/example/trade/technodata/Agents.csv

This file was deleted.

4 changes: 0 additions & 4 deletions src/muse/data/example/trade/technodata/gas/CommIn.csv

This file was deleted.

4 changes: 0 additions & 4 deletions src/muse/data/example/trade/technodata/gas/CommOut.csv

This file was deleted.

12 changes: 0 additions & 12 deletions src/muse/data/example/trade/technodata/gas/ExistingTrade.csv

This file was deleted.

4 changes: 0 additions & 4 deletions src/muse/data/example/trade/technodata/gas/Technodata.csv

This file was deleted.

15 changes: 0 additions & 15 deletions src/muse/data/example/trade/technodata/gas/TradeTechnodata.csv

This file was deleted.

6 changes: 0 additions & 6 deletions src/muse/data/example/trade/technodata/power/CommIn.csv

This file was deleted.

6 changes: 0 additions & 6 deletions src/muse/data/example/trade/technodata/power/CommOut.csv

This file was deleted.

32 changes: 0 additions & 32 deletions src/muse/data/example/trade/technodata/power/ExistingTrade.csv

This file was deleted.

6 changes: 0 additions & 6 deletions src/muse/data/example/trade/technodata/power/Technodata.csv

This file was deleted.

21 changes: 0 additions & 21 deletions src/muse/data/example/trade/technodata/power/TradeTechnodata.csv

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading