diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index 2af3c5bdf..ed28cd276 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.79450000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.91960000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.44990000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.86100000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,16.71490000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.91960000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.01750000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.86100000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.79450000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.91960000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.44990000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.86100000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,16.71490000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.91960000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.01750000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.86100000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,15.53550000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.91960000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,9.88590000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.86100000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,15.53550000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.91960000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.35840000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.86100000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.62150000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.67440000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.57520000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.14890000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.49890000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.67440000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.71990000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.14890000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.62150000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.67440000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.57520000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.14890000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.49890000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.67440000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.71990000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.14890000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,11.37620000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.67440000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,9.86470000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.14890000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,15.93760000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.67440000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.14890000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,27.93810000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,18.20480000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,17.11120000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.92760000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.50260000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.20480000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.39330000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.92760000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,27.93810000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,18.20480000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,17.11120000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.92760000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.50260000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.20480000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.39330000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.92760000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,11.83400000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.20480000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.82890000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,13.92760000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,15.28480000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.20480000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,13.03440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.92760000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,28.69690000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.64740000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,19.13560000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.88880000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.03790000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.64740000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.37310000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.88880000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,28.69690000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,18.64740000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,19.13560000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.88880000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.03790000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.64740000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.37310000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.88880000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,12.04500000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.64740000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,13.74380000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,15.88880000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.70840000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.64740000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,14.99180000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,15.88880000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,31.12680000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,19.78490000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,22.24850000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,18.74330000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,21.67520000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.78490000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,19.32750000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,18.74330000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,31.12680000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,19.78490000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,22.24850000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,18.74330000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,21.67520000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.78490000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,19.32750000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,18.74330000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,12.22360000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,19.78490000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,16.40640000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,18.74330000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,16.94940000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.78490000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,17.86690000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,18.74330000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,30.00890000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,19.53380000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,24.65190000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.32000000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,21.05190000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.53380000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,21.82980000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.32000000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,30.00890000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,19.53380000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,24.65190000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.32000000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,21.05190000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.53380000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,21.82980000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.32000000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,12.62180000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.53380000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,19.11300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,21.32000000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,16.57340000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.53380000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,20.41870000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.32000000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 9c2f8adbb..a4f8d9226 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -44,45 +44,41 @@ A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 +A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 +A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,5.37500000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,14.62500000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 @@ -90,19 +86,17 @@ A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,5.37500000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,0.90620000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,14.62500000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,8.15620000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,8.53130000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 6dd836112..af9577817 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.79450000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.91960000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.44990000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.86100000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,16.71490000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.91960000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.01750000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.86100000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.79450000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.91960000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.44990000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.86100000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,16.71490000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.91960000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.01750000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.86100000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,15.53550000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.91960000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,9.88590000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.86100000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,15.53550000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.91960000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.35840000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.86100000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.62150000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.67440000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.57520000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.14890000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.49890000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.67440000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.71990000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.14890000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.62150000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.67440000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.57520000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.14890000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.49890000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.67440000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.71990000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.14890000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,11.37620000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.67440000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,9.86470000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.14890000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,15.93760000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.67440000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.14890000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,27.93810000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,18.20480000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,17.11120000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.92760000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.50260000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.20480000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.39330000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.92760000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,27.93810000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,18.20480000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,17.11120000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.92760000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.50260000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.20480000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.39330000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.92760000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,11.83400000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.20480000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.82890000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,13.92760000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,15.28480000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.20480000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,13.03440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.92760000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,28.69690000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.77180000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,19.13560000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,13.00110000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.03790000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.77180000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.37310000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,13.00110000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,28.69690000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.77180000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,19.13560000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,13.00110000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.03790000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.77180000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.37310000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,13.00110000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,12.04500000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.77180000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,13.74380000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.00110000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.70840000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.77180000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,14.99180000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,13.00110000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,30.68450000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.61580000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,18.57100000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.24370000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,21.01770000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.61580000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,14.09200000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.24370000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,30.68450000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.61580000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,18.57100000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.24370000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,21.01770000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.61580000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,14.09200000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.24370000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,11.35100000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.61580000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,9.61310000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.24370000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,16.18440000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.61580000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.85260000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.24370000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,26.95250000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,17.86660000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.11000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.74410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.53890000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.86660000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.30160000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.74410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,26.95250000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.86660000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.11000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.74410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.53890000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.86660000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.30160000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.74410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,11.43000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.86660000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,6.01500000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.74410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.33200000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.86660000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.89730000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.74410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index a529850e6..81c8cb97e 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv @@ -2,35 +2,37 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,16.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,20.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,11.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,13.12220000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,7.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index be5fc8b12..c8b006471 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.78890000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.37150000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.49630000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.73650000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.25210000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.37150000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.90130000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.73650000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.78890000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.37150000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.49630000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.73650000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.25210000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.37150000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.90130000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.73650000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,13.79410000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.37150000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.73650000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.51000000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.37150000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.60580000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.73650000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.23940000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.85650000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.27490000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.48640000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.40190000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.85650000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.99130000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.48640000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.23940000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,19.85650000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.27490000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.48640000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.40190000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.85650000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.99130000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.48640000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,19.85650000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.80890000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.48640000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.51750000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.85650000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.85760000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.48640000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,30.11110000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.01050000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.04090000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.40110000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.98030000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.01050000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.64400000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.40110000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,30.11110000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.01050000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.04090000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.40110000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.98030000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.01050000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.64400000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.40110000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.01050000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.40110000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.95030000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.01050000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.96440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.40110000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.31080000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.78520000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.27410000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.06220000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.44920000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.78520000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.79870000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.06220000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.31080000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.78520000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.27410000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.06220000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.44920000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.78520000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.79870000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.06220000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.78520000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.06220000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.55290000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.78520000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.08010000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.06220000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,28.81720000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,26.46380000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.68530000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.10320000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.12170000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,26.46380000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.40800000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.10320000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,28.81720000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,26.46380000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.68530000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.10320000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.12170000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,26.46380000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.40800000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.10320000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,26.46380000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.10320000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.30790000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,26.46380000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.78780000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.10320000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,28.34170000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.00280000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.84390000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.18620000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.80620000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.00280000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.51320000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.18620000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,28.34170000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.00280000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.84390000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.18620000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.80620000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.00280000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.51320000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.18620000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.00280000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.18620000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.07180000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.00280000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.86650000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.18620000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index bd9949c60..dc4bef5f0 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,23.72940000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,15.14750000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,13.92520000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.68210000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,16.44690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,15.14750000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.34790000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.68210000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,23.72940000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,15.14750000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,13.92520000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.68210000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,16.44690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,15.14750000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.34790000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.68210000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,9.46380000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,15.14750000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.86530000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.68210000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,12.80570000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,15.14750000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,8.55920000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.68210000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,23.13530000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,14.16450000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.43880000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.20200000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,15.42350000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,14.16450000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,8.95920000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.20200000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,23.13530000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,14.16450000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.43880000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.20200000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,15.42350000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,14.16450000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,8.95920000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.20200000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,14.16450000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,8.20200000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,11.56760000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.16450000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.71940000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.20200000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,13.58310000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.26320000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.05540000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.26320000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,13.58310000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.26320000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.05540000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.26320000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,8.26320000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.79160000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.26320000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,24.19760000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,14.62300000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,14.24420000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,16.13180000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.62300000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.49610000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,24.19760000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,14.62300000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,14.24420000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,16.13180000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.62300000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.49610000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,14.62300000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,12.09880000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.62300000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.12210000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.00810000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,8.44660000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.33870000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.44660000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.00810000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,8.44660000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.33870000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.44660000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,8.44660000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.00400000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.44660000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.24420000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.49610000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.24420000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.49610000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.12210000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 9d0e2acf9..f59c669d3 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv @@ -2,41 +2,51 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,19.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,11.62600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 -A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 -A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 -A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 -A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2050 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.91410000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index b5e21cadc..9062092d8 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,30.32710000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,21.18690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,30.32710000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,21.18690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.04670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.61680000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.95190000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.83290000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.34350000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.86940000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.96800000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.83290000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.09370000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.86940000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.95190000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.83290000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.34350000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.86940000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.96800000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.83290000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.09370000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.86940000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,10.32830000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.83290000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.92150000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.86940000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.97600000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.83290000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.96880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.86940000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.49290000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.56210000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.30980000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.62230000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.66190000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.56210000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.87320000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.62230000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,29.49290000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.56210000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.30980000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.62230000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.66190000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.56210000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.87320000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.62230000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.83100000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.56210000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.57430000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.62230000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.74650000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.56210000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.15490000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.62230000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.11580000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.51490000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.12620000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.00340000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.41060000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.51490000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.75080000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.00340000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.11580000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.51490000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.12620000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.00340000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.41060000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.51490000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.75080000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.00340000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.70530000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.51490000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.37540000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.00340000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.55790000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.51490000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.06310000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.00340000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,28.57480000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.73500000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.97540000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.49140000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.04990000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,24.73500000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.65020000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.49140000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,28.57480000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,24.73500000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.97540000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.49140000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.04990000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,24.73500000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.65020000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.49140000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.52490000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.73500000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.32510000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.49140000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.28740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,24.73500000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.98770000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.49140000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,28.15410000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,25.57320000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.75900000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.82670000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.76940000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,25.57320000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.50600000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.82670000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,28.15410000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,25.57320000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.75900000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,12.82670000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.76940000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,25.57320000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.50600000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.82670000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.38470000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,25.57320000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.25300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.82670000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.07700000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,25.57320000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.87950000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.82670000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 8372798e6..0e3ff2e19 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv @@ -20,56 +20,58 @@ A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,23.43330000000,R2,2020,R2,gas,gassupply1,newcapa,2030 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 -A1,26.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,10.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2035 -A1,26.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 +A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 +A1,20.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2035 A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2035 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2035 -A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2035 -A1,26.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A1,16.00000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 -A1,26.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 +A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 +A1,20.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2040 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2040 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2040 -A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2040 -A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2040 -A1,16.00000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 +A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2045 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045 A1,20.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 -A1,26.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,26.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2045 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 +A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2045 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2045 -A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2045 -A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2050 A1,22.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 A1,20.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 -A1,26.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,11.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,26.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 -A1,11.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2050 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2050 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2050 -A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 834c47225..3f6809b3d 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv @@ -47,291 +47,291 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,14.43830000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,14.43830000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.95410000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.95410000000,R2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,13.20140000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,13.20140000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,12.95410000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,12.95410000000,R2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,14.43830000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,14.43830000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.95410000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.95410000000,R2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,13.20140000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,13.20140000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,12.95410000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,12.95410000000,R2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.96460000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.96460000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,12.95410000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,12.95410000000,R2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,12.58300000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,12.58300000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.95410000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.95410000000,R2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,16.70430000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,16.70430000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.29130000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.29130000000,R2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,15.50860000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,15.50860000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.29130000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.29130000000,R2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,16.70430000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,16.70430000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.29130000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.29130000000,R2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,15.50860000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,15.50860000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.29130000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.29130000000,R2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.35420000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.29130000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.29130000000,R2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,14.91080000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,14.91080000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,15.29130000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,15.29130000000,R2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,20.57330000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,20.57330000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.41210000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.41210000000,R2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,19.33650000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,19.33650000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.41210000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.41210000000,R2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,20.57330000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,20.57330000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.41210000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.41210000000,R2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,19.33650000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,19.33650000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.41210000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.41210000000,R2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,18.09960000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,18.09960000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.41210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.41210000000,R2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,18.71800000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,18.71800000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.41210000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.41210000000,R2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,24.31870000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,24.31870000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,20.44320000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,20.44320000000,R2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,23.08180000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,23.08180000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,20.44320000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,20.44320000000,R2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,24.31870000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,24.31870000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,20.44320000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,20.44320000000,R2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,23.08180000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,23.08180000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,20.44320000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,20.44320000000,R2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,21.84500000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,21.84500000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.44320000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.44320000000,R2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,22.46340000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,22.46340000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,20.44320000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,20.44320000000,R2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,59.99930000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,59.99930000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,31.24370000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,31.24370000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,22.07200000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,22.07200000000,R2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,39.99950000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,39.99950000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,24.78030000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,24.78030000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,22.07200000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,22.07200000000,R2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,59.99930000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,59.99930000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,31.24370000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,31.24370000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,22.07200000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,22.07200000000,R2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,39.99950000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,39.99950000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,24.78030000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,24.78030000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,22.07200000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,22.07200000000,R2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,19.99980000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,19.99980000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.31680000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.31680000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.07200000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.07200000000,R2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,29.99960000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,29.99960000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.54860000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.54860000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,22.07200000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,22.07200000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,59.99930000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,59.99930000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,33.34050000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,33.34050000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,23.92260000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,23.92260000000,R2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,39.99950000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,39.99950000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,25.49220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,25.49220000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.92260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.92260000000,R2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,59.99930000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,59.99930000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,33.34050000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,33.34050000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,23.92260000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,23.92260000000,R2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,39.99950000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,39.99950000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,25.49220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,25.49220000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.92260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.92260000000,R2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,19.99980000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,19.99980000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.64400000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.64400000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.92260000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.92260000000,R2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,29.99960000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,29.99960000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.56810000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.56810000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,23.92260000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,23.92260000000,R2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index 7a984d661..0a572222b 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -3,53 +3,63 @@ A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020 A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,24.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,61.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2030 -A1,10.00000000000,R1,2025,R1,residential,gas_stove,newcapa,2030 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2025 +A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,24.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,54.36670000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,17.07890000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 -A1,10.00000000000,R1,2025,R1,residential,gas_stove,newcapa,2035 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,4.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,32.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index 7478dbc8e..40c6715d3 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,29.60050000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.45130000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.36600000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,10.81680000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,20.22790000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,9.99810000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.45130000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.36600000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,10.19830000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,29.60050000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,9.99810000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.45130000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.36600000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,10.81680000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,20.22790000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,9.99810000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.45130000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.36600000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,10.19830000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,11.04390000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,9.99810000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.45130000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.36600000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,9.57990000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,15.54150000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,9.99810000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.45130000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.36600000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,9.88910000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,28.99960000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,9.99810000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.86950000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.21210000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.08400000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,12.60140000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.33310000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,10.08400000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.86950000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.00610000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.08400000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,12.00350000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,28.99960000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,10.08400000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.86950000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.21210000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.08400000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,12.60140000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.33310000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,10.08400000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.86950000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.00610000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.08400000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,12.00350000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,10.08400000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.86950000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.87620000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.08400000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,11.42630000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,14.49980000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,10.08400000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.86950000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.90310000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.08400000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,11.70460000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,29.03190000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,10.08400000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.98000000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,10.58940000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,15.83490000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,19.35460000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,10.58940000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.98000000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.58940000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,11.82530000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,29.03190000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,10.58940000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.98000000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,10.58940000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,15.83490000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,19.35460000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,10.58940000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.98000000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.58940000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,11.82530000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,10.58940000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.98000000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.58940000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,7.90890000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.51590000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,10.58940000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.98000000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.58940000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,9.82050000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,29.64250000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,10.58940000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,20.55170000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.81810000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,19.76170000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,10.81810000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.55170000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,29.64250000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,20.55170000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.81810000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,19.76170000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,10.81810000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.55170000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,20.55170000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.81810000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,14.82120000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,10.81810000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,20.55170000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.81810000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,10.81810000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,21.28220000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.18600000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,11.11030000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,16.18600000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,11.11030000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.28220000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.79070000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.11030000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,10.79070000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,11.11030000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.28220000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.18600000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,11.11030000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,16.18600000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,11.11030000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.28220000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.79070000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.11030000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,10.79070000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,11.11030000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.28220000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.11030000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,11.11030000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.28220000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09300000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.11030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,8.09300000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,31.08270000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.11030000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,21.84970000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.76210000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.33730000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,16.76210000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,21.65230000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,11.33730000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,21.84970000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.54690000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,11.54690000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,31.08270000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,21.84970000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.76210000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.33730000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,16.76210000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,21.65230000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,11.33730000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,21.84970000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.54690000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,11.54690000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,12.33240000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,21.84970000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,6.37600000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.33730000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,6.37600000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,16.93710000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,11.33730000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,21.84970000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.93940000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.33730000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,8.93940000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.33730000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index 7c45f0b0b..a86cc709d 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv @@ -23,75 +23,75 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.45650000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.15070000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,15.82560000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.03660000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.71110000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.15070000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.78500000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.03660000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,28.45650000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.15070000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,15.82560000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.03660000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.71110000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.15070000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.78500000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.03660000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,11.32510000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.15070000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.85820000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.03660000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,15.33840000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.15070000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,9.76470000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.03660000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,26.13870000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.07270000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,14.64020000000,R1,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,0.14000000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.77800000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.76530000000,R1,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,0.12000000000,R1,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,18.07270000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,10.70100000000,R1,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,0.14000000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,26.13870000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.76530000000,R1,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,0.12000000000,R1,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,18.07270000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,14.64020000000,R1,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,0.14000000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.77800000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.76530000000,R1,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,0.12000000000,R1,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,18.07270000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,10.70100000000,R1,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,0.14000000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,14.05910000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.76530000000,R1,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,0.12000000000,R1,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,18.07270000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,7.06670000000,R1,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,0.14000000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,16.59760000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.76530000000,R1,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,0.12000000000,R1,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,18.07270000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,8.73140000000,R1,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,0.14000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,28.31600000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.76530000000,R1,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,19.37380000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,15.65540000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,10.34690000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,20.79320000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.37380000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.20330000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.34690000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,28.31600000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.37380000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,15.65540000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,10.34690000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,20.79320000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.37380000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.20330000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.34690000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,13.43040000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.37380000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.81520000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.34690000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,17.03180000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.37380000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.97720000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.34690000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index f2c4946fa..4407df9bf 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,12.62770000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.52500000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.46720000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.75250000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,9.14540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.52500000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.09320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.75250000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,12.85430000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,9.41810000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.75530000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.75250000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.14540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.52500000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.09320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.75250000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,5.96160000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.52500000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.81380000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.75250000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,7.81060000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,9.06240000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,7.16510000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.75250000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 9e580eb17..bdb9ecbb2 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,13.93410000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.03590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.82840000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.60570000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,9.92540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.03590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.28770000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.60570000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,14.06800000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,10.21280000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.12940000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.60570000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.92540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.03590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.28770000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.60570000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,5.07980000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.25580000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.31070000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.60570000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,7.03060000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.25580000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.56400000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.60570000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 1b2c297a2..90da2b071 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -2,41 +2,46 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,22.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,28.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,17.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,20.85560000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 5a6369539..e6051e7d2 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -31,195 +31,195 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.73140000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.66930000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.54990000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.66180000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,21.13150000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.66930000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,12.00320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.66180000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,28.73140000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,19.66930000000,R1,2,MUS$2010/PJ,2025 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,12.54990000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,10.66180000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,21.13150000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.66930000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,12.00320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.66180000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.39310000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.66930000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.66180000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.06490000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.66930000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.63880000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.66180000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,16.06490000000,R1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,19.66930000000,R1,6,MUS$2010/PJ,2025 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,11.63880000000,R1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,10.66180000000,R1,6,MUS$2010/PJ,2025 CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,16.06490000000,R1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,19.66930000000,R1,7,MUS$2010/PJ,2025 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,11.63880000000,R1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,10.66180000000,R1,7,MUS$2010/PJ,2025 CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.14590000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.50550000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.55760000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.99970000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.14590000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.24310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.55760000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,20.14590000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,15.50550000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,10.55760000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.99970000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.14590000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.24310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.55760000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.14590000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.47790000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.55760000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.14590000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.73480000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.55760000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,14.99980000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,20.14590000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,11.73480000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,10.55760000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,14.99980000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,20.14590000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,11.73480000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,10.55760000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.46390000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,21.73500000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.25160000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.15810000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,20.62470000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,21.73500000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.37610000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.15810000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,29.46390000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,21.73500000000,R1,2,MUS$2010/PJ,2035 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,16.25160000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,11.15810000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,20.62470000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,21.73500000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.37610000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.15810000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,21.73500000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.15810000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.73200000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,21.73500000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.12580000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.15810000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,14.73200000000,R1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,21.73500000000,R1,6,MUS$2010/PJ,2035 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,8.12580000000,R1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,11.15810000000,R1,6,MUS$2010/PJ,2035 CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,14.73200000000,R1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,21.73500000000,R1,7,MUS$2010/PJ,2035 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,8.12580000000,R1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,11.15810000000,R1,7,MUS$2010/PJ,2035 CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.84660000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,22.98980000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.09250000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,11.68510000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.89260000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,22.98980000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.26480000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.68510000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,29.84660000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,22.98980000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,16.09250000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,11.68510000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.89260000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,22.98980000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.26480000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.68510000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.98980000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.68510000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.92330000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,22.98980000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.04630000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.68510000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,14.92330000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,22.98980000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,8.04630000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,11.68510000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,14.92330000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,22.98980000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,8.04630000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,11.68510000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 -electricity,all-week,night,all-year,29.46390000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.50140000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.19040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.26470000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,20.62470000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,24.50140000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.33320000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.26470000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,mid-afternoon,all-year,29.46390000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,24.50140000000,R1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,16.19040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,12.26470000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,20.62470000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,24.50140000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.33320000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.26470000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.50140000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.26470000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.73200000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,24.50140000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09520000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.26470000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,early-morning,all-year,14.73200000000,R1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,24.50140000000,R1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,8.09520000000,R1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,12.26470000000,R1,6,MUS$2010/PJ,2045 CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045 -electricity,all-week,late-afternoon,all-year,14.73200000000,R1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,24.50140000000,R1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,8.09520000000,R1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,12.26470000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.16630000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,25.73530000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.08020000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.77780000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,20.41640000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,25.73530000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.25620000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.77780000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,29.16630000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,25.73530000000,R1,2,MUS$2010/PJ,2050 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,16.08020000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,12.77780000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,20.41640000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,25.73530000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.25620000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.77780000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,25.73530000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.77780000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.58320000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,25.73530000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.04010000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.77780000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,14.58320000000,R1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,25.73530000000,R1,6,MUS$2010/PJ,2050 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,8.04010000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,12.77780000000,R1,6,MUS$2010/PJ,2050 CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,14.58320000000,R1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,25.73530000000,R1,7,MUS$2010/PJ,2050 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,8.04010000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,12.77780000000,R1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index 5b4e39d1d..7f8f5eb37 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -2,96 +2,144 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 -A1,24.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2022 -A1,17.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2024 -A1,24.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2024 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2024 -A1,15.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2026 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2026 -A1,22.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2026 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2026 -A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2026 -A1,13.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2028 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2028 +A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2022 +A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2022 +A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2024 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024 +A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2024 +A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2026 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2026 +A1,13.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2026 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2026 +A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2028 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 -A1,19.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2028 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2028 -A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2028 -A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2028 -A1,11.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2030 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2030 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2028 +A1,10.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2028 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2028 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2028 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2030 -A1,16.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2030 -A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2030 -A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2030 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2030 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2032 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2032 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2032 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2032 A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2032 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2034 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2034 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 +A1,4.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2032 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2032 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2032 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2032 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2032 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 -A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 +A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2034 A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2034 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 -A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2036 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 +A1,1.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2034 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2034 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2034 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2034 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2034 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 -A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 +A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2036 A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2036 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 -A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 -A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2038 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2036 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2036 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 +A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2038 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 -A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 +A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2038 A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2038 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 -A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 -A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040 A1,8.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2040 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 A1,3.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 -A1,9.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2040 -A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2040 -A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2040 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2040 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 21a1723f6..df9e17239 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -31,323 +31,323 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,16.36400000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,11.14530000000,R1,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,9.59760000000,R1,0,MUS$2010/PJ,2022 CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022 -electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,16.36400000000,R1,1,MUS$2010/PJ,2022 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,10.58990000000,R1,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,9.59760000000,R1,1,MUS$2010/PJ,2022 CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022 -electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,16.36400000000,R1,2,MUS$2010/PJ,2022 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,11.14530000000,R1,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,9.59760000000,R1,2,MUS$2010/PJ,2022 CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022 -electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,16.36400000000,R1,3,MUS$2010/PJ,2022 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,10.58990000000,R1,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,9.59760000000,R1,3,MUS$2010/PJ,2022 CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022 -electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,16.36400000000,R1,4,MUS$2010/PJ,2022 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,9.91240000000,R1,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,9.59760000000,R1,4,MUS$2010/PJ,2022 CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022 -electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,16.36400000000,R1,5,MUS$2010/PJ,2022 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,10.21960000000,R1,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,9.59760000000,R1,5,MUS$2010/PJ,2022 CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022 -electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,16.36400000000,R1,6,MUS$2010/PJ,2022 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,10.21960000000,R1,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,9.59760000000,R1,6,MUS$2010/PJ,2022 CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022 -electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,16.36400000000,R1,7,MUS$2010/PJ,2022 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,10.21960000000,R1,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,9.59760000000,R1,7,MUS$2010/PJ,2022 CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022 -electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,18.03310000000,R1,0,MUS$2010/PJ,2024 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,12.08070000000,R1,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,10.15040000000,R1,0,MUS$2010/PJ,2024 CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024 -electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,18.03310000000,R1,1,MUS$2010/PJ,2024 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,11.53140000000,R1,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,10.15040000000,R1,1,MUS$2010/PJ,2024 CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024 -electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,18.03310000000,R1,2,MUS$2010/PJ,2024 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,12.08070000000,R1,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,10.15040000000,R1,2,MUS$2010/PJ,2024 CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024 -electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,18.03310000000,R1,3,MUS$2010/PJ,2024 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,11.53140000000,R1,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,10.15040000000,R1,3,MUS$2010/PJ,2024 CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024 -electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,18.03310000000,R1,4,MUS$2010/PJ,2024 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,10.86820000000,R1,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,10.15040000000,R1,4,MUS$2010/PJ,2024 CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024 -electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,18.03310000000,R1,5,MUS$2010/PJ,2024 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,11.16520000000,R1,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,10.15040000000,R1,5,MUS$2010/PJ,2024 CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024 -electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,18.03310000000,R1,6,MUS$2010/PJ,2024 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,11.16520000000,R1,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,10.15040000000,R1,6,MUS$2010/PJ,2024 CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024 -electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,18.03310000000,R1,7,MUS$2010/PJ,2024 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,11.16520000000,R1,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,10.15040000000,R1,7,MUS$2010/PJ,2024 CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024 -electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,18.50630000000,R1,0,MUS$2010/PJ,2026 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,13.01990000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,10.27560000000,R1,0,MUS$2010/PJ,2026 CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026 -electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,18.50630000000,R1,1,MUS$2010/PJ,2026 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,12.47560000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,10.27560000000,R1,1,MUS$2010/PJ,2026 CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026 -electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,18.50630000000,R1,2,MUS$2010/PJ,2026 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,13.01990000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,10.27560000000,R1,2,MUS$2010/PJ,2026 CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026 -electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,18.50630000000,R1,3,MUS$2010/PJ,2026 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,12.47560000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,10.27560000000,R1,3,MUS$2010/PJ,2026 CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026 -electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,18.50630000000,R1,4,MUS$2010/PJ,2026 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,11.82410000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,10.27560000000,R1,4,MUS$2010/PJ,2026 CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026 -electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,18.50630000000,R1,5,MUS$2010/PJ,2026 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,12.11280000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,10.27560000000,R1,5,MUS$2010/PJ,2026 CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026 -electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,18.50630000000,R1,6,MUS$2010/PJ,2026 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,12.11280000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,10.27560000000,R1,6,MUS$2010/PJ,2026 CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026 -electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,18.50630000000,R1,7,MUS$2010/PJ,2026 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,12.11280000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,10.27560000000,R1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026 -electricity,all-week,night,all-year,21.78380000000,R1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,20.12490000000,R1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,13.79450000000,R1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,10.70840000000,R1,0,MUS$2010/PJ,2028 CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028 -electricity,all-week,morning,all-year,20.43760000000,R1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,20.12490000000,R1,1,MUS$2010/PJ,2028 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,13.05290000000,R1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,10.70840000000,R1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,21.78380000000,R1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,20.12490000000,R1,2,MUS$2010/PJ,2028 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,13.79450000000,R1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,10.70840000000,R1,2,MUS$2010/PJ,2028 CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028 -electricity,all-week,early-peak,all-year,20.43760000000,R1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,20.12490000000,R1,3,MUS$2010/PJ,2028 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,13.05290000000,R1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,10.70840000000,R1,3,MUS$2010/PJ,2028 CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028 -electricity,all-week,late-peak,all-year,20.03640000000,R1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,20.12490000000,R1,4,MUS$2010/PJ,2028 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,12.24840000000,R1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,10.70840000000,R1,4,MUS$2010/PJ,2028 CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028 -electricity,all-week,evening,all-year,20.03640000000,R1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,20.12490000000,R1,5,MUS$2010/PJ,2028 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,12.59030000000,R1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,10.70840000000,R1,5,MUS$2010/PJ,2028 CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028 -electricity,all-week,early-morning,all-year,20.03640000000,R1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,20.12490000000,R1,6,MUS$2010/PJ,2028 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,12.59030000000,R1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,10.70840000000,R1,6,MUS$2010/PJ,2028 CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028 -electricity,all-week,late-afternoon,all-year,20.03640000000,R1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,20.12490000000,R1,7,MUS$2010/PJ,2028 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,12.59030000000,R1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,10.70840000000,R1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,27.14130000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.54700000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.04110000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.71800000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.52480000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.54700000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.39530000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.71800000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,27.14130000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,20.54700000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,15.04110000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,10.71800000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.52480000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.54700000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.39530000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.71800000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,13.10640000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.54700000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.46970000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.71800000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,16.11390000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.54700000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.29810000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.71800000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,16.11390000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,20.54700000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,12.29810000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,10.71800000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,16.11390000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,20.54700000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,12.29810000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,10.71800000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,27.76890000000,R1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,21.52420000000,R1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,15.61150000000,R1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,11.09330000000,R1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,20.16660000000,R1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,21.52420000000,R1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,12.48980000000,R1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,11.09330000000,R1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,27.76890000000,R1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,21.52420000000,R1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,15.61150000000,R1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,11.09330000000,R1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,20.16660000000,R1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,21.52420000000,R1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,12.48980000000,R1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,11.09330000000,R1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,11.57930000000,R1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,21.52420000000,R1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,8.91720000000,R1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,11.09330000000,R1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,15.09840000000,R1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,21.52420000000,R1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,10.40860000000,R1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,11.09330000000,R1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,15.09840000000,R1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,21.52420000000,R1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,10.40860000000,R1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,11.09330000000,R1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,15.09840000000,R1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,21.52420000000,R1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,10.40860000000,R1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,11.09330000000,R1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,28.90960000000,R1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,22.24330000000,R1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,16.15900000000,R1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,11.36750000000,R1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,20.82540000000,R1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,22.24330000000,R1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,12.26530000000,R1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,11.36750000000,R1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,28.90960000000,R1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,22.24330000000,R1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,16.15900000000,R1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,11.36750000000,R1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,20.82540000000,R1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,22.24330000000,R1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,12.26530000000,R1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,11.36750000000,R1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,11.34000000000,R1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,22.24330000000,R1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,7.65920000000,R1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,11.36750000000,R1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,15.43600000000,R1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,22.24330000000,R1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,9.66950000000,R1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,11.36750000000,R1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,15.43600000000,R1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,22.24330000000,R1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,9.66950000000,R1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,11.36750000000,R1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,15.43600000000,R1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,22.24330000000,R1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,9.66950000000,R1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,11.36750000000,R1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,29.00110000000,R1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,22.87420000000,R1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,15.94520000000,R1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,11.60810000000,R1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,20.82440000000,R1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,22.87420000000,R1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,11.52040000000,R1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,11.60810000000,R1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,29.00110000000,R1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,22.87420000000,R1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,15.94520000000,R1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,11.60810000000,R1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,20.82440000000,R1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,22.87420000000,R1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,11.52040000000,R1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,11.60810000000,R1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,11.23880000000,R1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,22.87420000000,R1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,6.30000000000,R1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,11.60810000000,R1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,15.37320000000,R1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,22.87420000000,R1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,8.57040000000,R1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,11.60810000000,R1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,15.37320000000,R1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,22.87420000000,R1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,8.57040000000,R1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,11.60810000000,R1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,15.37320000000,R1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,22.87420000000,R1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,8.57040000000,R1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,11.60810000000,R1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036 -electricity,all-week,night,all-year,29.01340000000,R1,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,23.43220000000,R1,0,MUS$2010/PJ,2038 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,15.96350000000,R1,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,11.82100000000,R1,0,MUS$2010/PJ,2038 CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038 -electricity,all-week,morning,all-year,20.84430000000,R1,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,23.43220000000,R1,1,MUS$2010/PJ,2038 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,11.54170000000,R1,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,11.82100000000,R1,1,MUS$2010/PJ,2038 CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038 -electricity,all-week,mid-afternoon,all-year,29.01340000000,R1,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,23.43220000000,R1,2,MUS$2010/PJ,2038 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,15.96350000000,R1,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,11.82100000000,R1,2,MUS$2010/PJ,2038 CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038 -electricity,all-week,early-peak,all-year,20.84430000000,R1,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,23.43220000000,R1,3,MUS$2010/PJ,2038 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,11.54170000000,R1,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,11.82100000000,R1,3,MUS$2010/PJ,2038 CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038 -electricity,all-week,late-peak,all-year,11.30590000000,R1,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,23.43220000000,R1,4,MUS$2010/PJ,2038 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,6.34770000000,R1,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,11.82100000000,R1,4,MUS$2010/PJ,2038 CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038 -electricity,all-week,evening,all-year,15.39820000000,R1,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,23.43220000000,R1,5,MUS$2010/PJ,2038 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,8.59380000000,R1,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,11.82100000000,R1,5,MUS$2010/PJ,2038 CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038 -electricity,all-week,early-morning,all-year,15.39820000000,R1,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,23.43220000000,R1,6,MUS$2010/PJ,2038 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,8.59380000000,R1,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,11.82100000000,R1,6,MUS$2010/PJ,2038 CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038 -electricity,all-week,late-afternoon,all-year,15.39820000000,R1,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,23.43220000000,R1,7,MUS$2010/PJ,2038 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,8.59380000000,R1,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,11.82100000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,29.74200000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.99230000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.36400000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.08610000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,21.34970000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.99230000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.82000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.08610000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,29.74200000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,23.99230000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,16.36400000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.08610000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,21.34970000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.99230000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.82000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.08610000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,11.32890000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.99230000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.36560000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.08610000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.75480000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.99230000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.79060000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.08610000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,15.75480000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,23.99230000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,8.79060000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.08610000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,15.75480000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,23.99230000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,8.79060000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.08610000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv index a23d8d32e..24109432c 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index 7d1d3c8b4..6582dda8b 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,23.65520000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.05040000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,13.53940000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.60580000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,17.07860000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.05040000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.18560000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.60580000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,23.65520000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.05040000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,13.53940000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.60580000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,17.07860000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.05040000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.18560000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.60580000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,11.06570000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.05040000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.01030000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.60580000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,13.79030000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.05040000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,8.50870000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.60580000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,24.62710000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,15.61770000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,14.03560000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.78330000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,16.91320000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,15.61770000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,9.55510000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.78330000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,24.62710000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,15.61770000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,14.03560000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.78330000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,16.91320000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,15.61770000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,9.55510000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.78330000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.67720000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,15.61770000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.31390000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,8.78330000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.05630000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.61770000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,7.31490000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.78330000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,25.63370000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,16.08280000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,14.58250000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.03050000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.59880000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.08280000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.92550000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.03050000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,25.63370000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,16.08280000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,14.58250000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.03050000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.59880000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.08280000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.92550000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.03050000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.73490000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,16.08280000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.33700000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.03050000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,13.58140000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,16.08280000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.59710000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.03050000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,25.79830000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.19560000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,14.64830000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.07570000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,17.73090000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.19560000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.97840000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.07570000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,25.79830000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.19560000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,14.64830000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.07570000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,17.73090000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.19560000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.97840000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.07570000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.81020000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.19560000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.36710000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.07570000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,13.69720000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.19560000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.64340000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.07570000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,26.02320000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.38170000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.73830000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.15010000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,17.93140000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.38170000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.05860000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.15010000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,26.02320000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.38170000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.73830000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.15010000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,17.93140000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.38170000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.05860000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.15010000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.96810000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.38170000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.43020000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.15010000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,13.88550000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.38170000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.71870000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.15010000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,26.77680000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,16.87480000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.03970000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.34730000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.47300000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,16.87480000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.27520000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.34730000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,26.77680000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,16.87480000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.03970000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.34730000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.47300000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,16.87480000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.27520000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.34730000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,10.28610000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,16.87480000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.55750000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.34730000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.32110000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.87480000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.89300000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.34730000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/src/muse/costs.py b/src/muse/costs.py index 21bb21a53..ecc2bb51f 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -6,7 +6,6 @@ - capacity: xr.DataArray with the capacity of the technologies - production: xr.DataArray with commodity production by the technologies - consumption: xr.DataArray with commodity consumption by the technologies -- timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") - method: "lifetime" or "annual" Data should only be provided for a single year (i.e. no "year" dimension in any of the @@ -14,10 +13,6 @@ (i.e. have a "timeslice" dimension). Technology parameters may also be specified at the timeslice level, but capacity should not be. -`timeslice_level` is given as an argument to some functions, but in this case it must -match the timeslice level of any timesliced inputs, so is generally not configurable, -but only included to ensure consistency and provide explicitness. - The `technologies` input will usually contain data for multiple technologies and have a "technology" dimension (sometimes called "asset" or "replacement"). In this case, it's important that the `capacity`, `production`, and `consumption` inputs have a @@ -28,14 +23,15 @@ the parent functions to ensure that these are consistent between inputs to prevent unwanted broadcasting. -The dimensions of the output will be the sum of all dimensions from the input data, -minus "commodity", plus "timeslice" (if not already present). +Some costs are calculated at the timeslice level (e.g. fuel costs), while others are +calculated for the year/lifetime as a whole (e.g. capital costs, LCOE). Refer to the +individual function docstrings for more details. Some functions have a `method` argument, which can be "annual" or "lifetime": Costs can either be annual or lifetime: -- annual: calculates the cost for each timeslice in a single year -- lifetime: calculates the total cost in each timeslice over the lifetime of the +- annual: calculates the cost in a single year +- lifetime: calculates the total cost over the lifetime of the technology, using the `technical_life` attribute from the `technologies` dataset. - In this case, technology parameters, production, consumption, capacity and prices are assumed to be constant over the lifetime of the technology. The cost in each @@ -58,7 +54,6 @@ from muse.commodities import is_enduse, is_fuel, is_material, is_pollutant from muse.quantities import production_amplitude -from muse.timeslices import broadcast_timeslice, distribute_timeslice from muse.utilities import filter_input @@ -70,7 +65,6 @@ def wrapper(*args, **kwargs): result = func(*args, **kwargs) assert "year" not in result.dims assert "commodity" not in result.dims - assert "timeslice" in result.dims return result return wrapper @@ -80,7 +74,6 @@ def wrapper(*args, **kwargs): def capital_costs( technologies: xr.Dataset, capacity: xr.DataArray, - timeslice_level: str | None = None, method: str = "lifetime", ): """Calculate capital costs for the relevant technologies. @@ -92,20 +85,15 @@ def capital_costs( - lifetime: returns the full capital costs - annual: total capital costs are multiplied by the capital recovery factor to get annualized costs - - Costs are distributed uniformly over timeslices, with the timeslice level specified """ if method not in ["lifetime", "annual"]: raise ValueError("method must be either 'lifetime' or 'annual'.") - _capital_costs = distribute_timeslice( - technologies.cap_par * (capacity**technologies.cap_exp), level=timeslice_level - ) + _capital_costs = technologies.cap_par * (capacity**technologies.cap_exp) if method == "annual": crf = capital_recovery_factor(technologies) - _capital_costs = _capital_costs * broadcast_timeslice( - crf, level=timeslice_level - ) + _capital_costs = _capital_costs * crf + assert "timeslice" not in _capital_costs.dims return _capital_costs @@ -113,66 +101,66 @@ def capital_costs( def environmental_costs( technologies: xr.Dataset, prices: xr.DataArray, production: xr.DataArray ) -> xr.DataArray: - """Calculate annual environmental costs for the relevant technologies. + """Calculate timeslice-level environmental costs for the relevant technologies. This is the total production of pollutants (commodities flagged by `is_pollutant`) multiplied by their prices. """ environmentals = is_pollutant(technologies.comm_usage) prices_environmental = filter_input(prices, commodity=environmentals) - return (production * prices_environmental).sum("commodity") + result = (production * prices_environmental).sum("commodity") + assert "timeslice" in result.dims + return result @cost def fuel_costs( technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray ) -> xr.DataArray: - """Calculate annual fuel costs for the relevant technologies. + """Calculate timeslice-level fuel costs for the relevant technologies. This is the total consumption of fuels (commodities flagged by `is_fuel`) multiplied by their prices. """ fuels = is_fuel(technologies.comm_usage) prices_fuel = filter_input(prices, commodity=fuels) - return (consumption * prices_fuel).sum("commodity") + result = (consumption * prices_fuel).sum("commodity") + assert "timeslice" in result.dims + return result @cost def material_costs( technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray ) -> xr.DataArray: - """Calculate annual material costs for the relevant technologies. + """Calculate timeslice-level material costs for the relevant technologies. This is the total consumption of materials (commodities flagged by `is_material`) multiplied by their prices. """ material = is_material(technologies.comm_usage) prices_material = filter_input(prices, commodity=material) - return (consumption * prices_material).sum("commodity") + result = (consumption * prices_material).sum("commodity") + assert "timeslice" in result.dims + return result @cost -def fixed_costs( - technologies: xr.Dataset, capacity: xr.DataArray, timeslice_level: str | None = None -) -> xr.DataArray: +def fixed_costs(technologies: xr.Dataset, capacity: xr.DataArray) -> xr.DataArray: """Calculate annual fixed costs for the relevant technologies. This is the fixed running cost over the course of a year corresponding to the `fix_par` and `fix_exp` technology parameters. - - This cost is scaled by the capacity of the technology and distributed uniformly - over the timeslices, with the timeslice level specified """ - return distribute_timeslice( - technologies.fix_par * (capacity**technologies.fix_exp), level=timeslice_level - ) + result = technologies.fix_par * (capacity**technologies.fix_exp) + assert "timeslice" not in result.dims + return result @cost def variable_costs( technologies: xr.Dataset, production: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Calculate annual variable costs for the relevant technologies. @@ -183,12 +171,9 @@ def variable_costs( in each timeslice based on `production`. This is then used to scale the variable costs. """ - tech_activity = production_amplitude(production, technologies, timeslice_level) - result = broadcast_timeslice( - technologies.var_par, level=timeslice_level - ) * tech_activity ** broadcast_timeslice( - technologies.var_exp, level=timeslice_level - ) + tech_activity = production_amplitude(production, technologies).sum("timeslice") + result = technologies.var_par * tech_activity**technologies.var_exp + assert "timeslice" not in result.dims return result @@ -199,7 +184,6 @@ def running_costs( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Total annual running costs (excluding capital costs). @@ -215,17 +199,18 @@ def running_costs( _environmental_costs = environmental_costs(technologies, prices, production) _fuel_costs = fuel_costs(technologies, prices, consumption) _material_costs = material_costs(technologies, prices, consumption) - _fixed_costs = fixed_costs(technologies, capacity, timeslice_level) - _variable_costs = variable_costs(technologies, production, timeslice_level) + _fixed_costs = fixed_costs(technologies, capacity) + _variable_costs = variable_costs(technologies, production) # Total running costs result = ( - _environmental_costs - + _fuel_costs - + _material_costs + _environmental_costs.sum("timeslice") + + _fuel_costs.sum("timeslice") + + _material_costs.sum("timeslice") + _fixed_costs + _variable_costs ) + assert "timeslice" not in result.dims return result @@ -236,7 +221,6 @@ def net_present_value( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Net present value (NPV) of the relevant technologies. @@ -264,32 +248,30 @@ def net_present_value( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the NPV calculated for the relevant technologies """ # Capital costs (lifetime) - _capital_costs = capital_costs( - technologies, capacity, timeslice_level, method="lifetime" - ) + _capital_costs = capital_costs(technologies, capacity, method="lifetime") # Revenue (annual) products = is_enduse(technologies.comm_usage) prices_non_env = filter_input(prices, commodity=products) - revenues = (production * prices_non_env).sum("commodity") + revenues = (production * prices_non_env).sum(["commodity", "timeslice"]) # Running costs (annual) _running_costs = running_costs( - technologies, prices, capacity, production, consumption, timeslice_level + technologies, prices, capacity, production, consumption ) # Calculate running costs and revenues over lifetime - _running_costs = annual_to_lifetime(_running_costs, technologies, timeslice_level) - revenues = annual_to_lifetime(revenues, technologies, timeslice_level) + _running_costs = annual_to_lifetime(_running_costs, technologies) + revenues = annual_to_lifetime(revenues, technologies) # Net present value result = revenues - (_capital_costs + _running_costs) + assert "timeslice" not in result.dims return result @@ -300,7 +282,6 @@ def net_present_cost( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Net present cost (NPC) of the relevant technologies. @@ -318,14 +299,12 @@ def net_present_cost( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the NPC calculated for the relevant technologies """ - result = -net_present_value( - technologies, prices, capacity, production, consumption, timeslice_level - ) + result = -net_present_value(technologies, prices, capacity, production, consumption) + assert "timeslice" not in result.dims return result @@ -336,7 +315,6 @@ def equivalent_annual_cost( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Equivalent annual costs (or annualized cost) of a technology. @@ -358,7 +336,6 @@ def equivalent_annual_cost( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the EAC calculated for the relevant technologies @@ -369,10 +346,10 @@ def equivalent_annual_cost( capacity, production, consumption, - timeslice_level=timeslice_level, ) crf = capital_recovery_factor(technologies) - result = npc * broadcast_timeslice(crf, level=timeslice_level) + result = npc * crf + assert "timeslice" not in result.dims return result @@ -383,7 +360,6 @@ def levelized_cost_of_energy( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, method: str = "lifetime", ) -> xr.DataArray: """Levelized cost of energy (LCOE) of technologies over their lifetime. @@ -414,7 +390,6 @@ def levelized_cost_of_energy( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") method: "lifetime" or "annual" Return: @@ -424,11 +399,11 @@ def levelized_cost_of_energy( raise ValueError("method must be either 'lifetime' or 'annual'.") # Capital costs (lifetime or annual depending on method) - _capital_costs = capital_costs(technologies, capacity, timeslice_level, method) + _capital_costs = capital_costs(technologies, capacity, method) # Running costs (annual) _running_costs = running_costs( - technologies, prices, capacity, production, consumption, timeslice_level + technologies, prices, capacity, production, consumption ) # Production (annual) @@ -437,19 +412,18 @@ def levelized_cost_of_energy( production.where(production > 0.0, 1e-6) .sel(commodity=products) .sum( - "commodity" + ["commodity", "timeslice"] ) # TODO: is this the correct way to deal with multiple products? ) # If method is lifetime, have to adjust running costs and production if method == "lifetime": - _running_costs = annual_to_lifetime( - _running_costs, technologies, timeslice_level - ) - prod = annual_to_lifetime(prod, technologies, timeslice_level) + _running_costs = annual_to_lifetime(_running_costs, technologies) + prod = annual_to_lifetime(prod, technologies) # LCOE result = (_capital_costs + _running_costs) / prod + assert "timeslice" not in result.dims return result @@ -503,9 +477,7 @@ def capital_recovery_factor(technologies: xr.Dataset) -> xr.DataArray: return crf -def annual_to_lifetime( - costs: xr.DataArray, technologies: xr.Dataset, timeslice_level: str | None = None -): +def annual_to_lifetime(costs: xr.DataArray, technologies: xr.Dataset): """Convert annual costs to lifetime costs. Costs are provided for a single year. These same costs are assumed to apply for the @@ -515,11 +487,10 @@ def annual_to_lifetime( Args: costs: xr.DataArray of costs for a single year. technologies: xr.Dataset of technology parameters - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") """ assert "year" not in costs.dims assert "year" not in technologies.dims - assert "timeslice" in costs.dims + assert "timeslice" not in costs.dims life = technologies.technical_life.astype(int) iyears = range(life.values.max()) years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") @@ -528,7 +499,6 @@ def annual_to_lifetime( interest_rate=technologies.interest_rate, mask=years <= life, ) - rates = broadcast_timeslice(rates, level=timeslice_level) return (costs * rates).sum("year") diff --git a/src/muse/objectives.py b/src/muse/objectives.py index d395d75d4..afed259db 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -306,7 +306,7 @@ def fixed_costs( from muse.costs import fixed_costs capacity = capacity_to_service_demand(technologies, demand) - result = fixed_costs(technologies, capacity).sum("timeslice") + result = fixed_costs(technologies, capacity) return result @@ -327,7 +327,7 @@ def capital_costs( from muse.costs import capital_costs capacity = capacity_to_service_demand(technologies, demand) - result = capital_costs(technologies, capacity, method="lifetime").sum("timeslice") + result = capital_costs(technologies, capacity, method="lifetime") result = xr.broadcast(result, demand.asset)[0] return result @@ -434,7 +434,6 @@ def annual_levelized_cost_of_energy( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, method="annual", ) @@ -481,7 +480,6 @@ def lifetime_levelized_cost_of_energy( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, method="lifetime", ) @@ -523,7 +521,6 @@ def net_present_value( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, ) return results @@ -602,6 +599,5 @@ def equivalent_annual_cost( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, ) return results diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 4d639413f..c5626a2c5 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -323,9 +323,7 @@ def consumption( ) # Calculate degree of technology activity - prod_amplitude = production_amplitude( - production, params, timeslice_level=timeslice_level - ) + prod_amplitude = production_amplitude(production, params) # Calculate consumption of fixed commodities consumption_fixed = prod_amplitude * broadcast_timeslice( @@ -558,7 +556,6 @@ def capacity_to_service_demand( def production_amplitude( production: xr.DataArray, technologies: xr.Dataset, - timeslice_level: Optional[str] = None, ) -> xr.DataArray: """Calculates the degree of technology activity based on production data. @@ -576,14 +573,15 @@ def production_amplitude( Must have `timeslice` and `commodity` dimensions. May also have other dimensions e.g. `region`, `year`, etc. technologies: Dataset of technology parameters - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day"). - Must match the timeslice level of `production` Returns: DataArray with production amplitudes for each technology in each timeslice. Will have the same dimensions as `production`, minus the `commodity` dimension. """ + from muse.timeslices import get_level + assert set(technologies.dims).issubset(set(production.dims)) + timeslice_level = get_level(production) return ( production diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 79f15b1ad..839afbee4 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -14,7 +14,12 @@ from muse.sectors.abstract import AbstractSector from muse.sectors.register import register_sector from muse.sectors.subsector import Subsector -from muse.timeslices import compress_timeslice, expand_timeslice, get_level +from muse.timeslices import ( + broadcast_timeslice, + compress_timeslice, + expand_timeslice, + get_level, +) @register_sector(name="default") @@ -321,14 +326,13 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: capacity=capacity.isel(year=1), production=supply.isel(year=1), consumption=consume.isel(year=1), - timeslice_level=self.timeslice_level, method="annual", ) # Calculate new commodity prices costs = supply_cost( supply.where(~is_pollutant(supply.comm_usage), 0), - lcoe, + broadcast_timeslice(lcoe, level=self.timeslice_level), asset_dim="asset", ) diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 0a20fcc39..e7cfae67c 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -2,41 +2,61 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 25a14a2a1..17bba3927 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,29.26230000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.72190000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.51690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.72190000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,29.26230000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.72190000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.51690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.72190000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.13090000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.72190000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.14420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.72190000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,28.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.21210000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.17680000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.33310000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.60150000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.00610000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.17680000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,28.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.60150000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.21210000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.17680000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.33310000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.60150000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.00610000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.17680000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.60150000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.87620000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.17680000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.49980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.60150000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.90310000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.17680000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,15.92890000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.23780000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.10090000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.61930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.23780000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,15.92890000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.23780000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.10090000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.61930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.23780000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.10090000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.23780000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.10090000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.96440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.23780000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.28540000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.91910000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.52360000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.80410000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.91910000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.28540000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.91910000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.52360000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.80410000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.91910000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.80410000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.91910000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.64270000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.80410000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.91910000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,27.99370000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.04320000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.79490000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,27.99370000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.69540000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.79490000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,27.99370000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.04320000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.79490000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,27.99370000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.69540000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.79490000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.99370000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.79490000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,27.99370000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.02160000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.79490000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.44410000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.47410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.62940000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.69170000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.47410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.44410000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.47410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.62940000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.69170000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.47410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.69170000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.47410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.72200000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.69170000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.47410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index d81760203..e0af1be69 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -2,41 +2,51 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2025 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2025 +A1,7.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2025 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2025 +A1,19.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,retrofit,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2030 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2030 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2030 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2030 +A1,11.62600000000,R1,2020,R1,gas,gassupply1,retrofit,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2035 -A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2035 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2035 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2035 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2035 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2035 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2040 -A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2040 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2040 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2040 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2040 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2040 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2040 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2045 -A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2045 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2045 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2045 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2045 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2045 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2045 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2050 -A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2050 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2050 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2050 +A1,7.91410000000,R1,2045,R1,power,windturbine,retrofit,2050 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2050 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2050 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 89d70fbf7..d1d6049d3 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,30.32710000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,21.18690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,30.32710000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,21.18690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.04670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.61680000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.76060000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.46990000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.90170000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.76060000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.08250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.90170000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.76060000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.46990000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.90170000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.76060000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.08250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.90170000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.76060000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.90170000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.76060000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.88880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.90170000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.07660000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.22810000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.07660000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.22810000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.07660000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.22810000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.07660000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.22810000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.07660000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.22810000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.07660000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.22810000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.72020000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.08550000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.72020000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.08550000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.72020000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.08550000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.72020000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.08550000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.72020000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.08550000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.72020000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.08550000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,25.30560000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.71960000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,25.30560000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.71960000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,25.30560000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.71960000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,25.30560000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.71960000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,25.30560000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.71960000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,25.30560000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.71960000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,26.53870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.21290000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,26.53870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.21290000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,26.53870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.21290000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,26.53870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.21290000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,26.53870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.21290000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,26.53870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.21290000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 1fef9b401..76b93450a 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,12.62770000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.60100000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.46720000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.66660000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,9.14540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.60100000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.09320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.66660000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,12.62770000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.60100000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.46720000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.66660000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.14540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.60100000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.09320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.66660000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,5.96160000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.60100000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.81380000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.66660000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,7.40420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.60100000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.90620000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.66660000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index 2958af3a8..7301cf34c 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -3,62 +3,62 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,12.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025 +A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,28.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,25.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,5.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 A1,4.00000000000,R1,2020,R1,residential,gasstove,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030 -A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,21.33720000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,5.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,17.83930000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,5.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035 -A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,5.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 +A1,8.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040 -A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,8.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,13.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045 -A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,13.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 +A1,11.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.20670000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2050 A1,17.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 -A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 -A1,17.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 +A1,16.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,6.66670000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.20670000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,3.33330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 646a3c9aa..63d4df954 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,29.11600000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.57780000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58960000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.24120000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,25.07480000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.57780000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.97120000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.24120000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,29.11600000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.57780000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58960000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.24120000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,25.07480000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.57780000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.97120000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.24120000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,21.96620000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.57780000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.35280000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.24120000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,23.05420000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.57780000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.66200000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.24120000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,17.14260000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.96890000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.06410000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.14260000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.81250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.06410000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.14260000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.96890000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.06410000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.14260000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.81250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.06410000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.14260000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,7.65610000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.06410000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.14260000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,9.73430000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.06410000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,28.33300000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.00770000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.32880000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.78430000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,18.88870000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.00770000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.78430000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,28.33300000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,17.00770000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.32880000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.78430000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,18.88870000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.00770000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.78430000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,17.00770000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.78430000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.16650000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,17.00770000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.78430000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,28.57110000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,17.39110000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.66220000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.40050000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,19.04740000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,17.39110000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.44150000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.40050000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,28.57110000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,17.39110000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.66220000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.40050000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,19.04740000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,17.39110000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.44150000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.40050000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,17.39110000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.40050000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,14.28550000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,17.39110000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.83110000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.40050000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,28.74960000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,17.46810000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.75740000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.55380000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,19.16640000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,17.46810000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.50500000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.55380000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,28.74960000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,17.46810000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.75740000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.55380000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,19.16640000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,17.46810000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.50500000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.55380000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,17.46810000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.55380000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,14.37480000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.46810000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.87870000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.55380000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,28.88850000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,17.52790000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.82890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.58470000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,19.25900000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.52790000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.55260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.58470000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,28.88850000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.52790000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.82890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.58470000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,19.25900000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.52790000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.55260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.58470000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.52790000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.58470000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,14.44430000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.52790000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.91440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.58470000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 0a01a70cd..85fd4acb7 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -14,96 +14,96 @@ ammonia,all-week,all-day,spring-autumn,321.15000000000,R1,2,MUS$2010/Mt,2010 fuel3,all-week,all-day,winter,0.06170000000,R1,0,MUS$2010/PJ,2015 fuel1,all-week,all-day,winter,1.08770000000,R1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.51690000000,R1,0,MUS$2010/PJ,2015 -ammonia,all-week,all-day,winter,393.66450000000,R1,0,MUS$2010/Mt,2015 +ammonia,all-week,all-day,winter,393.51770000000,R1,0,MUS$2010/Mt,2015 fuel3,all-week,all-day,summer,0.06170000000,R1,1,MUS$2010/PJ,2015 fuel1,all-week,all-day,summer,1.08770000000,R1,1,MUS$2010/PJ,2015 fuel2,all-week,all-day,summer,9.51690000000,R1,1,MUS$2010/PJ,2015 -ammonia,all-week,all-day,summer,393.23270000000,R1,1,MUS$2010/Mt,2015 +ammonia,all-week,all-day,summer,393.51770000000,R1,1,MUS$2010/Mt,2015 fuel3,all-week,all-day,spring-autumn,0.06170000000,R1,2,MUS$2010/PJ,2015 fuel1,all-week,all-day,spring-autumn,1.08770000000,R1,2,MUS$2010/PJ,2015 fuel2,all-week,all-day,spring-autumn,9.51690000000,R1,2,MUS$2010/PJ,2015 -ammonia,all-week,all-day,spring-autumn,393.66450000000,R1,2,MUS$2010/Mt,2015 +ammonia,all-week,all-day,spring-autumn,393.51770000000,R1,2,MUS$2010/Mt,2015 fuel3,all-week,all-day,winter,0.07020000000,R1,0,MUS$2010/PJ,2020 fuel1,all-week,all-day,winter,1.17540000000,R1,0,MUS$2010/PJ,2020 fuel2,all-week,all-day,winter,9.48260000000,R1,0,MUS$2010/PJ,2020 -ammonia,all-week,all-day,winter,416.67530000000,R1,0,MUS$2010/Mt,2020 +ammonia,all-week,all-day,winter,416.52820000000,R1,0,MUS$2010/Mt,2020 fuel3,all-week,all-day,summer,0.07020000000,R1,1,MUS$2010/PJ,2020 fuel1,all-week,all-day,summer,1.17540000000,R1,1,MUS$2010/PJ,2020 fuel2,all-week,all-day,summer,9.48260000000,R1,1,MUS$2010/PJ,2020 -ammonia,all-week,all-day,summer,416.24270000000,R1,1,MUS$2010/Mt,2020 +ammonia,all-week,all-day,summer,416.52820000000,R1,1,MUS$2010/Mt,2020 fuel3,all-week,all-day,spring-autumn,0.07020000000,R1,2,MUS$2010/PJ,2020 fuel1,all-week,all-day,spring-autumn,1.17540000000,R1,2,MUS$2010/PJ,2020 fuel2,all-week,all-day,spring-autumn,9.48260000000,R1,2,MUS$2010/PJ,2020 -ammonia,all-week,all-day,spring-autumn,416.67530000000,R1,2,MUS$2010/Mt,2020 +ammonia,all-week,all-day,spring-autumn,416.52820000000,R1,2,MUS$2010/Mt,2020 fuel3,all-week,all-day,winter,0.08280000000,R1,0,MUS$2010/PJ,2025 fuel1,all-week,all-day,winter,1.16670000000,R1,0,MUS$2010/PJ,2025 fuel2,all-week,all-day,winter,10.71080000000,R1,0,MUS$2010/PJ,2025 -ammonia,all-week,all-day,winter,471.79630000000,R1,0,MUS$2010/Mt,2025 +ammonia,all-week,all-day,winter,471.64890000000,R1,0,MUS$2010/Mt,2025 fuel3,all-week,all-day,summer,0.08280000000,R1,1,MUS$2010/PJ,2025 fuel1,all-week,all-day,summer,1.16670000000,R1,1,MUS$2010/PJ,2025 fuel2,all-week,all-day,summer,10.71080000000,R1,1,MUS$2010/PJ,2025 -ammonia,all-week,all-day,summer,471.36280000000,R1,1,MUS$2010/Mt,2025 +ammonia,all-week,all-day,summer,471.64890000000,R1,1,MUS$2010/Mt,2025 fuel3,all-week,all-day,spring-autumn,0.08280000000,R1,2,MUS$2010/PJ,2025 fuel1,all-week,all-day,spring-autumn,1.16670000000,R1,2,MUS$2010/PJ,2025 fuel2,all-week,all-day,spring-autumn,10.71080000000,R1,2,MUS$2010/PJ,2025 -ammonia,all-week,all-day,spring-autumn,471.79630000000,R1,2,MUS$2010/Mt,2025 +ammonia,all-week,all-day,spring-autumn,471.64890000000,R1,2,MUS$2010/Mt,2025 fuel3,all-week,all-day,winter,0.09540000000,R1,0,MUS$2010/PJ,2030 fuel1,all-week,all-day,winter,1.15790000000,R1,0,MUS$2010/PJ,2030 fuel2,all-week,all-day,winter,11.93900000000,R1,0,MUS$2010/PJ,2030 -ammonia,all-week,all-day,winter,526.39780000000,R1,0,MUS$2010/Mt,2030 +ammonia,all-week,all-day,winter,526.25020000000,R1,0,MUS$2010/Mt,2030 fuel3,all-week,all-day,summer,0.09540000000,R1,1,MUS$2010/PJ,2030 fuel1,all-week,all-day,summer,1.15790000000,R1,1,MUS$2010/PJ,2030 fuel2,all-week,all-day,summer,11.93900000000,R1,1,MUS$2010/PJ,2030 -ammonia,all-week,all-day,summer,525.96350000000,R1,1,MUS$2010/Mt,2030 +ammonia,all-week,all-day,summer,526.25020000000,R1,1,MUS$2010/Mt,2030 fuel3,all-week,all-day,spring-autumn,0.09540000000,R1,2,MUS$2010/PJ,2030 fuel1,all-week,all-day,spring-autumn,1.15790000000,R1,2,MUS$2010/PJ,2030 fuel2,all-week,all-day,spring-autumn,11.93900000000,R1,2,MUS$2010/PJ,2030 -ammonia,all-week,all-day,spring-autumn,526.39780000000,R1,2,MUS$2010/Mt,2030 +ammonia,all-week,all-day,spring-autumn,526.25020000000,R1,2,MUS$2010/Mt,2030 fuel3,all-week,all-day,winter,0.09070000000,R1,0,MUS$2010/PJ,2035 fuel1,all-week,all-day,winter,1.14910000000,R1,0,MUS$2010/PJ,2035 fuel2,all-week,all-day,winter,11.81550000000,R1,0,MUS$2010/PJ,2035 -ammonia,all-week,all-day,winter,495.55460000000,R1,0,MUS$2010/Mt,2035 +ammonia,all-week,all-day,winter,495.40650000000,R1,0,MUS$2010/Mt,2035 fuel3,all-week,all-day,summer,0.09070000000,R1,1,MUS$2010/PJ,2035 fuel1,all-week,all-day,summer,1.14910000000,R1,1,MUS$2010/PJ,2035 fuel2,all-week,all-day,summer,11.81550000000,R1,1,MUS$2010/PJ,2035 -ammonia,all-week,all-day,summer,495.11890000000,R1,1,MUS$2010/Mt,2035 +ammonia,all-week,all-day,summer,495.40650000000,R1,1,MUS$2010/Mt,2035 fuel3,all-week,all-day,spring-autumn,0.09070000000,R1,2,MUS$2010/PJ,2035 fuel1,all-week,all-day,spring-autumn,1.14910000000,R1,2,MUS$2010/PJ,2035 fuel2,all-week,all-day,spring-autumn,11.81550000000,R1,2,MUS$2010/PJ,2035 -ammonia,all-week,all-day,spring-autumn,495.55460000000,R1,2,MUS$2010/Mt,2035 +ammonia,all-week,all-day,spring-autumn,495.40650000000,R1,2,MUS$2010/Mt,2035 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2040 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2040 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2040 -ammonia,all-week,all-day,winter,464.13770000000,R1,0,MUS$2010/Mt,2040 +ammonia,all-week,all-day,winter,463.98930000000,R1,0,MUS$2010/Mt,2040 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2040 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2040 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2040 -ammonia,all-week,all-day,summer,463.70110000000,R1,1,MUS$2010/Mt,2040 +ammonia,all-week,all-day,summer,463.98930000000,R1,1,MUS$2010/Mt,2040 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2040 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2040 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2040 -ammonia,all-week,all-day,spring-autumn,464.13770000000,R1,2,MUS$2010/Mt,2040 +ammonia,all-week,all-day,spring-autumn,463.98930000000,R1,2,MUS$2010/Mt,2040 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2045 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2045 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2045 -ammonia,all-week,all-day,winter,461.93710000000,R1,0,MUS$2010/Mt,2045 +ammonia,all-week,all-day,winter,461.78860000000,R1,0,MUS$2010/Mt,2045 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2045 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2045 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2045 -ammonia,all-week,all-day,summer,461.50050000000,R1,1,MUS$2010/Mt,2045 +ammonia,all-week,all-day,summer,461.78860000000,R1,1,MUS$2010/Mt,2045 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 -ammonia,all-week,all-day,spring-autumn,461.93710000000,R1,2,MUS$2010/Mt,2045 +ammonia,all-week,all-day,spring-autumn,461.78860000000,R1,2,MUS$2010/Mt,2045 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,459.71170000000,R1,0,MUS$2010/Mt,2050 +ammonia,all-week,all-day,winter,459.56320000000,R1,0,MUS$2010/Mt,2050 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,459.27510000000,R1,1,MUS$2010/Mt,2050 +ammonia,all-week,all-day,summer,459.56320000000,R1,1,MUS$2010/Mt,2050 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,459.71170000000,R1,2,MUS$2010/Mt,2050 +ammonia,all-week,all-day,spring-autumn,459.56320000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index fcffde024..cdad299b3 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -3,56 +3,73 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A1,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A2,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,15.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,15.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 23c05a431..6b2d01f5b 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,29.26230000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.72190000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.51690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.72190000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,29.26230000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.72190000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.51690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.72190000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.13090000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.72190000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.14420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.72190000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,27.27240000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.06990000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.23800000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,18.18160000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.60150000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.81590000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.23800000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,27.27240000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.60150000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.06990000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.23800000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,18.18160000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.60150000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.81590000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.23800000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.60150000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.23800000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.63620000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.60150000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.68880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.23800000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.59240000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.77770000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.23780000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.72830000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.10090000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,12.53230000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.23780000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,29.59240000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.77770000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.23780000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.72830000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.10090000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,12.53230000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.23780000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.10090000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.32830000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.23780000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.79620000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.10090000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.40970000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.23780000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.66560000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,17.48300000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.91910000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.77710000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.80410000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,13.06660000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.91910000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.66560000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,17.48300000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.91910000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.77710000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.80410000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,13.06660000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.91910000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.80410000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,8.68550000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.91910000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.83280000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.80410000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.85840000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.91910000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,27.99370000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.19530000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.79490000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,27.99370000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.79690000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.79490000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,27.99370000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.19530000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.79490000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,27.99370000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.79690000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.79490000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.99370000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.79490000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,27.99370000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09760000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.79490000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.47410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.69170000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.47410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.47410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.69170000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.47410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.69170000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.47410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.69170000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.47410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index df717c78a..118984620 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -23,111 +23,111 @@ electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,117.23020000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,117.23020000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,23.60400000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,114.76360000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,23.36440000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,174.63580000000,R2,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,105.45240000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,105.45240000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,19.95270000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,105.34210000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,19.80280000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,159.98100000000,R2,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,126.35930000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,126.35930000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,22.89470000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,126.27890000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,22.67250000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,192.54730000000,R2,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,126.35930000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,126.35930000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,22.89470000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,126.27890000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,22.67250000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,192.54730000000,R2,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,101.25670000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,101.25670000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,19.27370000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,101.24580000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,19.14060000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,153.60930000000,R2,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,126.39030000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,126.39030000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,22.92520000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,126.27890000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,22.70220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,192.54730000000,R2,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,117.23020000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,117.23020000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,32.84270000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,163.53120000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,34.10390000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,245.46200000000,R2,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,105.45240000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,105.45240000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,27.36570000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,149.94900000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,28.42040000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,224.74900000000,R2,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,126.35930000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,126.35930000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,31.77870000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,180.13170000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,32.99980000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,270.77800000000,R2,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,126.35930000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,126.35930000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,31.77870000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,180.13170000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,32.99980000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,270.77800000000,R2,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,101.25670000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,101.25670000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,26.34730000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,144.04360000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,27.36360000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,215.74330000000,R2,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,126.39030000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,126.39030000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,31.82450000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,180.13170000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,33.04730000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,270.77800000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,8685.55900000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,8685.55900000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,46.70080000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,215.11500000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,50.20940000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,327.13430000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,7800.08140000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,7800.08140000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,38.48530000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,197.25240000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,41.34410000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,299.56730000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,9566.88680000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,9566.88680000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,45.10480000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,236.94710000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,48.48720000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,360.82720000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,9566.88680000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,9566.88680000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,45.10480000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,236.94710000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,48.48720000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,360.82720000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,7450.38850000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,7450.38850000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,36.95770000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,189.48610000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,39.69570000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,287.58170000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,9568.07120000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,9568.07120000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,45.17340000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,236.94710000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,48.56120000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,360.82720000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,21.63640000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,115.63450000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,21.44510000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,175.99040000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,21.63640000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,115.63450000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,21.44510000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,175.99040000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,21.63640000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,115.63450000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,21.44510000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,175.99040000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,21.63640000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,115.63450000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,21.44510000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,175.99040000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,21.63640000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,115.63450000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,21.44510000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,175.99040000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,21.63640000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,115.63450000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,21.44510000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,175.99040000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,29.89130000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,164.78670000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,31.04120000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,247.37670000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,29.89130000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,164.78670000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,31.04120000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,247.37670000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,29.89130000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,164.78670000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,31.04120000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,247.37670000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,29.89130000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,164.78670000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,31.04120000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,247.37670000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,29.89130000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,164.78670000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,31.04120000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,247.37670000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,29.89130000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,164.78670000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,31.04120000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,247.37670000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8677.86150000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,8677.86150000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,42.27370000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,216.76620000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,45.43210000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,329.68250000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,8677.86150000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,8677.86150000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,42.27370000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,216.76620000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,45.43210000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,329.68250000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,8677.86150000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,8677.86150000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,42.27370000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,216.76620000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,45.43210000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,329.68250000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,8677.86150000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,8677.86150000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,42.27370000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,216.76620000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,45.43210000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,329.68250000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8677.86150000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8677.86150000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,42.27370000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,216.76620000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,45.43210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,329.68250000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,8677.86150000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,8677.86150000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,42.27370000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,216.76620000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,45.43210000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,329.68250000000,R2,5,MUS$2010/PJ,2035 diff --git a/tests/test_costs.py b/tests/test_costs.py index 3369a4fb4..2cb9271d7 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -3,14 +3,6 @@ YEAR = 2030 -"""Expected dimensions for the output data of the cost functions. - -This should be the same for all cost functions. In general, this is the sum of all -dimensions from the input data, minus "commodity", plus "timeslice" (if not already -present). -""" -EXPECTED_DIMS = {"asset", "region", "technology", "timeslice"} - @fixture def _prices(market): @@ -79,49 +71,49 @@ def test_capital_costs(_technologies, _capacity): from muse.costs import capital_costs result = capital_costs(_technologies, _capacity) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_environmental_costs(_technologies, _prices, _production): from muse.costs import environmental_costs result = environmental_costs(_technologies, _prices, _production) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_fuel_costs(_technologies, _prices, _consumption): from muse.costs import fuel_costs result = fuel_costs(_technologies, _prices, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_material_costs(_technologies, _prices, _consumption): from muse.costs import material_costs result = material_costs(_technologies, _prices, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_fixed_costs(_technologies, _capacity): from muse.costs import fixed_costs result = fixed_costs(_technologies, _capacity) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_variable_costs(_technologies, _production): from muse.costs import variable_costs result = variable_costs(_technologies, _production) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_running_costs(_technologies, _prices, _capacity, _production, _consumption): from muse.costs import running_costs result = running_costs(_technologies, _prices, _capacity, _production, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_net_present_value( @@ -132,7 +124,7 @@ def test_net_present_value( result = net_present_value( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_net_present_cost(_technologies, _prices, _capacity, _production, _consumption): @@ -141,7 +133,7 @@ def test_net_present_cost(_technologies, _prices, _capacity, _production, _consu result = net_present_cost( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_equivalent_annual_cost( @@ -152,7 +144,7 @@ def test_equivalent_annual_cost( result = equivalent_annual_cost( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} @mark.parametrize("method", ["annual", "lifetime"]) @@ -164,16 +156,17 @@ def test_levelized_cost_of_energy( result = levelized_cost_of_energy( _technologies, _prices, _capacity, _production, _consumption, method=method ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_supply_cost(_technologies, _prices, _capacity, _production, _consumption): from muse.costs import levelized_cost_of_energy, supply_cost + from muse.timeslices import broadcast_timeslice lcoe = levelized_cost_of_energy( _technologies, _prices, _capacity, _production, _consumption, method="annual" ) - result = supply_cost(_production, lcoe) + result = supply_cost(_production, broadcast_timeslice(lcoe)) assert set(result.dims) == { "commodity", "region", @@ -193,7 +186,7 @@ def test_capital_recovery_factor(_technologies): def test_annual_to_lifetime(_technologies, _prices, _consumption): from muse.costs import annual_to_lifetime, fuel_costs - _fuel_costs = fuel_costs(_technologies, _prices, _consumption) + _fuel_costs = fuel_costs(_technologies, _prices, _consumption).sum("timeslice") _fuel_costs_lifetime = annual_to_lifetime(_fuel_costs, _technologies) assert set(_fuel_costs.dims) == set(_fuel_costs_lifetime.dims) assert (_fuel_costs_lifetime > _fuel_costs).all() diff --git a/tests/test_objectives.py b/tests/test_objectives.py index 31db80af9..9f56aadc5 100644 --- a/tests/test_objectives.py +++ b/tests/test_objectives.py @@ -179,35 +179,35 @@ def test_annual_levelized_cost_of_energy(_technologies, _demand, _prices): from muse.objectives import annual_levelized_cost_of_energy result = annual_levelized_cost_of_energy(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_lifetime_levelized_cost_of_energy(_technologies, _demand, _prices): from muse.objectives import lifetime_levelized_cost_of_energy result = lifetime_levelized_cost_of_energy(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_net_present_value(_technologies, _demand, _prices): from muse.objectives import net_present_value result = net_present_value(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_net_present_cost(_technologies, _demand, _prices): from muse.objectives import net_present_cost result = net_present_cost(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_equivalent_annual_cost(_technologies, _demand, _prices): from muse.objectives import equivalent_annual_cost result = equivalent_annual_cost(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def add_var(coordinates, *dims, factor=100.0):