Skip to content

Commit 13d95de

Browse files
tsmblandtsmbland
authored
Merge branch 'interpolation' into outputs
2 parents e77e194 + 5689352 commit 13d95de

2 files changed

Lines changed: 24 additions & 26 deletions

File tree

‎src/muse/demand_share.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,9 @@ def decommissioning(capacity, technologies):
288288
id_to_share: MutableMapping[Hashable, xr.DataArray] = {}
289289
for region in demands.region.values:
290290
retro_capacity: MutableMapping[Hashable, xr.DataArray] = {
291-
agent.uuid: agent.assets.capacity
291+
agent.uuid: agent.assets.capacity.interp(
292+
year=[current_year, investment_year]
293+
)
292294
for agent in agents
293295
if agent.category == "retrofit" and agent.region == region
294296
}
@@ -423,7 +425,9 @@ def decommissioning(capacity, technologies):
423425
for region in demands.region.values:
424426
# Calculate current capacity
425427
current_capacity: MutableMapping[Hashable, xr.DataArray] = {
426-
agent.uuid: agent.assets.capacity
428+
agent.uuid: agent.assets.capacity.interp(
429+
year=[current_year, investment_year]
430+
)
427431
for agent in agents
428432
if agent.region == region
429433
}

‎tests/example_outputs/trade/Results/MCAPrices.csv‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,72 +26,66 @@ gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020
2626
electricity,all-week,night,all-year,29.38390000000,R1,0,MUS$2010/PJ,2025
2727
electricity,all-week,night,all-year,25.66110000000,R2,0,MUS$2010/PJ,2025
2828
gas,all-week,night,all-year,14.62380000000,R1,0,MUS$2010/PJ,2025
29-
gas,all-week,night,all-year,112.12040000000,R2,0,MUS$2010/PJ,2025
29+
gas,all-week,night,all-year,11.81510000000,R2,0,MUS$2010/PJ,2025
3030
heat,all-week,night,all-year,13.62950000000,R1,0,MUS$2010/PJ,2025
31-
heat,all-week,night,all-year,108.50970000000,R2,0,MUS$2010/PJ,2025
3231
electricity,all-week,morning,all-year,29.38390000000,R1,1,MUS$2010/PJ,2025
3332
electricity,all-week,morning,all-year,25.66110000000,R2,1,MUS$2010/PJ,2025
3433
gas,all-week,morning,all-year,14.62380000000,R1,1,MUS$2010/PJ,2025
35-
gas,all-week,morning,all-year,112.12040000000,R2,1,MUS$2010/PJ,2025
34+
gas,all-week,morning,all-year,11.81510000000,R2,1,MUS$2010/PJ,2025
3635
heat,all-week,morning,all-year,13.62950000000,R1,1,MUS$2010/PJ,2025
37-
heat,all-week,morning,all-year,108.50970000000,R2,1,MUS$2010/PJ,2025
3836
electricity,all-week,afternoon,all-year,29.38390000000,R1,2,MUS$2010/PJ,2025
3937
electricity,all-week,afternoon,all-year,25.66110000000,R2,2,MUS$2010/PJ,2025
4038
gas,all-week,afternoon,all-year,14.62380000000,R1,2,MUS$2010/PJ,2025
41-
gas,all-week,afternoon,all-year,112.12040000000,R2,2,MUS$2010/PJ,2025
39+
gas,all-week,afternoon,all-year,11.81510000000,R2,2,MUS$2010/PJ,2025
4240
heat,all-week,afternoon,all-year,13.62950000000,R1,2,MUS$2010/PJ,2025
43-
heat,all-week,afternoon,all-year,108.50970000000,R2,2,MUS$2010/PJ,2025
4441
electricity,all-week,early-peak,all-year,29.38390000000,R1,3,MUS$2010/PJ,2025
4542
electricity,all-week,early-peak,all-year,25.66110000000,R2,3,MUS$2010/PJ,2025
4643
gas,all-week,early-peak,all-year,14.62380000000,R1,3,MUS$2010/PJ,2025
47-
gas,all-week,early-peak,all-year,112.12040000000,R2,3,MUS$2010/PJ,2025
44+
gas,all-week,early-peak,all-year,11.81510000000,R2,3,MUS$2010/PJ,2025
4845
heat,all-week,early-peak,all-year,13.62950000000,R1,3,MUS$2010/PJ,2025
49-
heat,all-week,early-peak,all-year,108.50970000000,R2,3,MUS$2010/PJ,2025
5046
electricity,all-week,late-peak,all-year,29.38390000000,R1,4,MUS$2010/PJ,2025
5147
electricity,all-week,late-peak,all-year,25.66110000000,R2,4,MUS$2010/PJ,2025
5248
gas,all-week,late-peak,all-year,14.62380000000,R1,4,MUS$2010/PJ,2025
53-
gas,all-week,late-peak,all-year,112.12040000000,R2,4,MUS$2010/PJ,2025
49+
gas,all-week,late-peak,all-year,11.81510000000,R2,4,MUS$2010/PJ,2025
5450
heat,all-week,late-peak,all-year,13.62950000000,R1,4,MUS$2010/PJ,2025
55-
heat,all-week,late-peak,all-year,108.50970000000,R2,4,MUS$2010/PJ,2025
5651
electricity,all-week,evening,all-year,29.38390000000,R1,5,MUS$2010/PJ,2025
5752
electricity,all-week,evening,all-year,25.66110000000,R2,5,MUS$2010/PJ,2025
5853
gas,all-week,evening,all-year,14.62380000000,R1,5,MUS$2010/PJ,2025
59-
gas,all-week,evening,all-year,112.12040000000,R2,5,MUS$2010/PJ,2025
54+
gas,all-week,evening,all-year,11.81510000000,R2,5,MUS$2010/PJ,2025
6055
heat,all-week,evening,all-year,13.62950000000,R1,5,MUS$2010/PJ,2025
61-
heat,all-week,evening,all-year,108.50970000000,R2,5,MUS$2010/PJ,2025
6256
electricity,all-week,night,all-year,33.82120000000,R1,0,MUS$2010/PJ,2030
6357
electricity,all-week,night,all-year,31.00090000000,R2,0,MUS$2010/PJ,2030
6458
gas,all-week,night,all-year,20.52280000000,R1,0,MUS$2010/PJ,2030
65-
gas,all-week,night,all-year,161.27260000000,R2,0,MUS$2010/PJ,2030
59+
gas,all-week,night,all-year,60.96730000000,R2,0,MUS$2010/PJ,2030
6660
heat,all-week,night,all-year,18.24100000000,R1,0,MUS$2010/PJ,2030
67-
heat,all-week,night,all-year,192.11860000000,R2,0,MUS$2010/PJ,2030
61+
heat,all-week,night,all-year,52.15770000000,R2,0,MUS$2010/PJ,2030
6862
electricity,all-week,morning,all-year,33.82120000000,R1,1,MUS$2010/PJ,2030
6963
electricity,all-week,morning,all-year,31.00090000000,R2,1,MUS$2010/PJ,2030
7064
gas,all-week,morning,all-year,20.52280000000,R1,1,MUS$2010/PJ,2030
71-
gas,all-week,morning,all-year,161.27260000000,R2,1,MUS$2010/PJ,2030
65+
gas,all-week,morning,all-year,60.96730000000,R2,1,MUS$2010/PJ,2030
7266
heat,all-week,morning,all-year,18.24100000000,R1,1,MUS$2010/PJ,2030
73-
heat,all-week,morning,all-year,192.11860000000,R2,1,MUS$2010/PJ,2030
67+
heat,all-week,morning,all-year,52.15770000000,R2,1,MUS$2010/PJ,2030
7468
electricity,all-week,afternoon,all-year,33.82120000000,R1,2,MUS$2010/PJ,2030
7569
electricity,all-week,afternoon,all-year,31.00090000000,R2,2,MUS$2010/PJ,2030
7670
gas,all-week,afternoon,all-year,20.52280000000,R1,2,MUS$2010/PJ,2030
77-
gas,all-week,afternoon,all-year,161.27260000000,R2,2,MUS$2010/PJ,2030
71+
gas,all-week,afternoon,all-year,60.96730000000,R2,2,MUS$2010/PJ,2030
7872
heat,all-week,afternoon,all-year,18.24100000000,R1,2,MUS$2010/PJ,2030
79-
heat,all-week,afternoon,all-year,192.11860000000,R2,2,MUS$2010/PJ,2030
73+
heat,all-week,afternoon,all-year,52.15770000000,R2,2,MUS$2010/PJ,2030
8074
electricity,all-week,early-peak,all-year,33.82120000000,R1,3,MUS$2010/PJ,2030
8175
electricity,all-week,early-peak,all-year,31.00090000000,R2,3,MUS$2010/PJ,2030
8276
gas,all-week,early-peak,all-year,20.52280000000,R1,3,MUS$2010/PJ,2030
83-
gas,all-week,early-peak,all-year,161.27260000000,R2,3,MUS$2010/PJ,2030
77+
gas,all-week,early-peak,all-year,60.96730000000,R2,3,MUS$2010/PJ,2030
8478
heat,all-week,early-peak,all-year,18.24100000000,R1,3,MUS$2010/PJ,2030
85-
heat,all-week,early-peak,all-year,192.11860000000,R2,3,MUS$2010/PJ,2030
79+
heat,all-week,early-peak,all-year,52.15770000000,R2,3,MUS$2010/PJ,2030
8680
electricity,all-week,late-peak,all-year,33.82120000000,R1,4,MUS$2010/PJ,2030
8781
electricity,all-week,late-peak,all-year,31.00090000000,R2,4,MUS$2010/PJ,2030
8882
gas,all-week,late-peak,all-year,20.52280000000,R1,4,MUS$2010/PJ,2030
89-
gas,all-week,late-peak,all-year,161.27260000000,R2,4,MUS$2010/PJ,2030
83+
gas,all-week,late-peak,all-year,60.96730000000,R2,4,MUS$2010/PJ,2030
9084
heat,all-week,late-peak,all-year,18.24100000000,R1,4,MUS$2010/PJ,2030
91-
heat,all-week,late-peak,all-year,192.11860000000,R2,4,MUS$2010/PJ,2030
85+
heat,all-week,late-peak,all-year,52.15770000000,R2,4,MUS$2010/PJ,2030
9286
electricity,all-week,evening,all-year,33.82120000000,R1,5,MUS$2010/PJ,2030
9387
electricity,all-week,evening,all-year,31.00090000000,R2,5,MUS$2010/PJ,2030
9488
gas,all-week,evening,all-year,20.52280000000,R1,5,MUS$2010/PJ,2030
95-
gas,all-week,evening,all-year,161.27260000000,R2,5,MUS$2010/PJ,2030
89+
gas,all-week,evening,all-year,60.96730000000,R2,5,MUS$2010/PJ,2030
9690
heat,all-week,evening,all-year,18.24100000000,R1,5,MUS$2010/PJ,2030
97-
heat,all-week,evening,all-year,192.11860000000,R2,5,MUS$2010/PJ,2030
91+
heat,all-week,evening,all-year,52.15770000000,R2,5,MUS$2010/PJ,2030

0 commit comments

Comments
 (0)