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 73015b102..c0b4ae36f 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,8.98640000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.18940000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,6.60550000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,1.05280000000,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,8.98640000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.18940000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,6.60550000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,1.05280000000,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,8.98640000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.18940000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,6.60550000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,1.05280000000,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,8.98640000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.18940000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,6.60550000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,1.05280000000,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,8.98640000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.18940000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.60550000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,1.05280000000,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,8.98640000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.18940000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.60550000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,1.05280000000,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,8.65200000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.32670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,7.25580000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,1.14160000000,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,8.65200000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.32670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,7.25580000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,1.14160000000,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,8.65200000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.32670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,7.25580000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,1.14160000000,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,8.65200000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.32670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,7.25580000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,1.14160000000,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.65200000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.32670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,7.25580000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,1.14160000000,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,8.65200000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.32670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,7.25580000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,1.14160000000,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,10.63240000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,2.69200000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.52450000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,1.46590000000,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,10.63240000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,2.69200000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.52450000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,1.46590000000,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,10.63240000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,2.69200000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.52450000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,1.46590000000,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,10.63240000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,2.69200000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.52450000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,1.46590000000,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,10.63240000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,2.69200000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.52450000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,1.46590000000,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,10.63240000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,2.69200000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.52450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,1.46590000000,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.12140000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,2.85460000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.49500000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,1.78340000000,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,11.12140000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,2.85460000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.49500000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,1.78340000000,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.12140000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,2.85460000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,11.49500000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,1.78340000000,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,11.12140000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,2.85460000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.49500000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,1.78340000000,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.12140000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,2.85460000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.49500000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,1.78340000000,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,11.12140000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,2.85460000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.49500000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,1.78340000000,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,12.34170000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.10970000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.36600000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,2.22980000000,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,12.34170000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.10970000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,14.36600000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,2.22980000000,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,12.34170000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.10970000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.36600000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,2.22980000000,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,12.34170000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.10970000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,14.36600000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,2.22980000000,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.34170000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.10970000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,14.36600000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,2.22980000000,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.34170000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.10970000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,14.36600000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,2.22980000000,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,13.34640000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,3.31490000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,17.19390000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,2.67440000000,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,13.34640000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,3.31490000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,17.19390000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,2.67440000000,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,13.34640000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,3.31490000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,17.19390000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,2.67440000000,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,13.34640000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,3.31490000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,17.19390000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,2.67440000000,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,13.34640000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,3.31490000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.19390000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,2.67440000000,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,13.34640000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,3.31490000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,17.19390000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,2.67440000000,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 65efa5671..4dd9eb605 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 @@ -7,105 +7,89 @@ A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,7.50000000000,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,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 -A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030 +A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,1.10000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2035 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 -A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2035 -A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035 +A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,3.75000000000,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,11.40000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A2,1.10000000000,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,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.09720000000,R1,2035,R1,power,gasCCGT,newcapa,2040 -A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,2.56250000000,R1,2035,R1,power,windturbine,newcapa,2040 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 -A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2040 -A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040 +A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,3.75000000000,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,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.09720000000,R1,2035,R1,power,gasCCGT,newcapa,2045 -A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,2.56250000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 -A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2045 -A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045 +A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,3.75000000000,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,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,3.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.09720000000,R1,2035,R1,power,gasCCGT,newcapa,2050 -A1,0.51250000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.56250000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,8.43750000000,R1,2025,R1,power,windturbine,newcapa,2050 -A2,1.02500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,2.78130000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,14.55000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,4.50010000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,4.97440000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,0.12180000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,3.37500000000,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 +A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,6.59380000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.75000000000,R1,2030,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 d707dfe8c..d436df88e 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,8.98640000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.12460000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,6.60550000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.61280000000,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,8.98640000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.12460000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,6.60550000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.61280000000,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,8.98640000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.12460000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,6.60550000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.61280000000,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,8.98640000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.12460000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,6.60550000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.61280000000,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,8.98640000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.12460000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.60550000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.61280000000,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,8.98640000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.12460000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.60550000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.61280000000,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,8.65200000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.32670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.95250000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.39560000000,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,8.65200000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.32670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.95250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.39560000000,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,8.65200000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.32670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.95250000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.39560000000,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,8.65200000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.32670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.95250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.39560000000,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.65200000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.32670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.95250000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.39560000000,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,8.65200000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.32670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.95250000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.39560000000,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,10.63240000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,2.69200000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,7.67980000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.42000000000,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,10.63240000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,2.69200000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,7.67980000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.42000000000,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,10.63240000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,2.69200000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,7.67980000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.42000000000,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,10.63240000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,2.69200000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,7.67980000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.42000000000,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,10.63240000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,2.69200000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,7.67980000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.42000000000,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,10.63240000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,2.69200000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.67980000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.42000000000,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,10.99080000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,2.85460000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.34560000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.43080000000,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,10.99080000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,2.85460000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.34560000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.43080000000,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,10.99080000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,2.85460000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.34560000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.43080000000,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,10.99080000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,2.85460000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.34560000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.43080000000,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,10.99080000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,2.85460000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,8.34560000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.43080000000,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,10.99080000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,2.85460000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.34560000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.43080000000,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,7.57960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.10970000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,3.27230000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.44780000000,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.57960000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.10970000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,3.27230000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.44780000000,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,7.57960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.10970000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,3.27230000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.44780000000,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.57960000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.10970000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,3.27230000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.44780000000,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,7.57960000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.10970000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.27230000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.44780000000,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,7.57960000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.10970000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,3.27230000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.44780000000,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,9.19440000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,3.32410000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,3.91830000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.46210000000,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,9.19440000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,3.32410000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,3.91830000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.46210000000,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,9.19440000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,3.32410000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,3.91830000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.46210000000,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,9.19440000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,3.32410000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,3.91830000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.46210000000,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.19440000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,3.32410000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.91830000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.46210000000,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,9.19440000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,3.32410000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,3.91830000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.46210000000,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/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index 34704e6f3..2b564aa75 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,12.25210000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.42260000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,6.16610000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.74180000000,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,12.25210000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.42260000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,6.16610000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.74180000000,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.25210000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.42260000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,6.16610000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.74180000000,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,12.25210000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.42260000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,6.16610000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.74180000000,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.25210000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.42260000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.16610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.74180000000,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.25210000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.42260000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.16610000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.74180000000,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,15.63730000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.98680000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.49540000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.43960000000,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.63730000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.98680000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.49540000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.43960000000,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,15.63730000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.98680000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.49540000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.43960000000,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.63730000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.98680000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.49540000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.43960000000,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,15.63730000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.98680000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.49540000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.43960000000,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.63730000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.98680000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.49540000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.43960000000,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,18.77110000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,3.62270000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,7.74890000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.48200000000,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,18.77110000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,3.62270000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,7.74890000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.48200000000,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,18.77110000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,3.62270000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,7.74890000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.48200000000,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,18.77110000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,3.62270000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,7.74890000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.48200000000,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,18.77110000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,3.62270000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,7.74890000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.48200000000,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,18.77110000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,3.62270000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.74890000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.48200000000,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,23.47910000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,4.40730000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,9.63210000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.53430000000,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,23.47910000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,4.40730000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.63210000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.53430000000,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,23.47910000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,4.40730000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,9.63210000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.53430000000,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,23.47910000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,4.40730000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.63210000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.53430000000,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,23.47910000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,4.40730000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,9.63210000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.53430000000,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,23.47910000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,4.40730000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,9.63210000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.53430000000,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.08320000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,5.50800000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,12.27380000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.60770000000,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,30.08320000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,5.50800000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.27380000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.60770000000,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.08320000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,5.50800000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,12.27380000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.60770000000,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,30.08320000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,5.50800000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,12.27380000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.60770000000,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,30.08320000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,5.50800000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.27380000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.60770000000,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,30.08320000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,5.50800000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.27380000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.60770000000,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,34.81960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,6.34520000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.16840000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.66350000000,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,34.81960000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,6.34520000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,14.16840000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.66350000000,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,34.81960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,6.34520000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.16840000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.66350000000,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,34.81960000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,6.34520000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,14.16840000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.66350000000,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,34.81960000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,6.34520000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.16840000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.66350000000,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,34.81960000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,6.34520000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,14.16840000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.66350000000,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 f027dd045..d33502c94 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,9.31290000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.14000000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.89380000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.61360000000,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.31290000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.14000000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.89380000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.61360000000,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,9.31290000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.14000000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.89380000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.61360000000,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.31290000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.14000000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.89380000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.61360000000,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.31290000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.14000000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.89380000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.61360000000,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,9.31290000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.14000000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.89380000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.61360000000,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,13.04460000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.69410000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.45830000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.42010000000,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,13.04460000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.69410000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.45830000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.42010000000,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,13.04460000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.69410000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.45830000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.42010000000,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,13.04460000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.69410000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.45830000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.42010000000,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.04460000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.69410000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.45830000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.42010000000,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.04460000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.69410000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.45830000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.42010000000,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,13.77810000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,2.95780000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,5.75170000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.43770000000,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,13.77810000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,2.95780000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.75170000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.43770000000,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,13.77810000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,2.95780000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,5.75170000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.43770000000,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,13.77810000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,2.95780000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.75170000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.43770000000,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,13.77810000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,2.95780000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.75170000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.43770000000,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.77810000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,2.95780000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,5.75170000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.43770000000,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,14.86180000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,3.20870000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.18520000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.45440000000,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,14.86180000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,3.20870000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.18520000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.45440000000,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,14.86180000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,3.20870000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.18520000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.45440000000,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,14.86180000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,3.20870000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.18520000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.45440000000,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,14.86180000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,3.20870000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.18520000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.45440000000,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.86180000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,3.20870000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.18520000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.45440000000,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,16.68400000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.56490000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,6.91410000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.47820000000,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.68400000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.56490000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,6.91410000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.47820000000,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,16.68400000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.56490000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,6.91410000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.47820000000,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.68400000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.56490000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,6.91410000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.47820000000,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,16.68400000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.56490000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,6.91410000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.47820000000,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.68400000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.56490000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,6.91410000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.47820000000,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,18.09750000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,3.84130000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.47950000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.49660000000,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.09750000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,3.84130000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.47950000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.49660000000,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,18.09750000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,3.84130000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.47950000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.49660000000,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.09750000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,3.84130000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.47950000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.49660000000,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,18.09750000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,3.84130000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,7.47950000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.49660000000,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,18.09750000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,3.84130000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.47950000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.49660000000,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/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index 7e7d41844..d3fbe303d 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,9.18790000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.20370000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.85420000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.61700000000,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.18790000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.20370000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.85420000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.61700000000,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,9.18790000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.20370000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.85420000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.61700000000,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.18790000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.20370000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.85420000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.61700000000,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.18790000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.20370000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.85420000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.61700000000,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,9.18790000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.20370000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.85420000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.61700000000,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,12.98770000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.73640000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.43560000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.42290000000,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,12.98770000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.73640000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.43560000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.42290000000,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,12.98770000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.73640000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.43560000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.42290000000,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,12.98770000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.73640000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.43560000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.42290000000,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,12.98770000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.73640000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.43560000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.42290000000,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,12.98770000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.73640000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.43560000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.42290000000,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,14.23820000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,3.09400000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,5.93580000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.44680000000,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,14.23820000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,3.09400000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.93580000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.44680000000,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,14.23820000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,3.09400000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,5.93580000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.44680000000,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,14.23820000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,3.09400000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.93580000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.44680000000,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,14.23820000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,3.09400000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.93580000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.44680000000,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.23820000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,3.09400000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,5.93580000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.44680000000,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,15.38600000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,3.35990000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.39490000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.46450000000,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,15.38600000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,3.35990000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.39490000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.46450000000,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,15.38600000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,3.35990000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.39490000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.46450000000,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,15.38600000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,3.35990000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.39490000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.46450000000,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,15.38600000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,3.35990000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.39490000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.46450000000,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.38600000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,3.35990000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.39490000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.46450000000,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,17.27880000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.71930000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.15200000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.48850000000,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.27880000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.71930000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.15200000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.48850000000,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,17.27880000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.71930000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.15200000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.48850000000,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.27880000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.71930000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.15200000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.48850000000,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,17.27880000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.71930000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.15200000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.48850000000,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,17.27880000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.71930000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.15200000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.48850000000,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,18.72140000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,3.96940000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.72910000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.50510000000,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.72140000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,3.96940000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.72910000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.50510000000,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,18.72140000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,3.96940000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.72910000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.50510000000,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.72140000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,3.96940000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.72910000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.50510000000,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,18.72140000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,3.96940000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,7.72910000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.50510000000,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,18.72140000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,3.96940000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.72910000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.50510000000,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/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 3ad18a847..d1b7a3125 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,9.39110000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,9.39110000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.21830000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.21830000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.91850000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.91850000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.61770000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.61770000000,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,9.39110000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,9.39110000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.21830000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.21830000000,R2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.91850000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.91850000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.61770000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.61770000000,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,9.39110000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,9.39110000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.21830000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.21830000000,R2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.91850000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.91850000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.61770000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.61770000000,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,9.39110000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,9.39110000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.21830000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.21830000000,R2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.91850000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.91850000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.61770000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.61770000000,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,9.39110000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,9.39110000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.21830000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.21830000000,R2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.91850000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.91850000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.61770000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.61770000000,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,9.39110000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,9.39110000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.21830000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.21830000000,R2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.91850000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.91850000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.61770000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.61770000000,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,12.60020000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,12.60020000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.69980000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.69980000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.13860000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.13860000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.64810000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.64810000000,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,12.60020000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,12.60020000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.69980000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.69980000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.13860000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.13860000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.64810000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.64810000000,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,12.60020000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,12.60020000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.69980000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.69980000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.13860000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.13860000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.64810000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.64810000000,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,12.60020000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,12.60020000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.69980000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.69980000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.13860000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.13860000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.64810000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.64810000000,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,12.60020000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,12.60020000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.69980000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.69980000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.13860000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.13860000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.64810000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.64810000000,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,12.60020000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,12.60020000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.69980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.69980000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.13860000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.13860000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.64810000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.64810000000,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,14.05870000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,14.05870000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,3.08380000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,3.08380000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,7.70020000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,7.70020000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.88250000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.88250000000,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,14.05870000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,14.05870000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,3.08380000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,3.08380000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,7.70020000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,7.70020000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.88250000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.88250000000,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,14.05870000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,14.05870000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,3.08380000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,3.08380000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,7.70020000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,7.70020000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.88250000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.88250000000,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,14.05870000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,14.05870000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,3.08380000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,3.08380000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,7.70020000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,7.70020000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.88250000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.88250000000,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,14.05870000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,14.05870000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,3.08380000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,3.08380000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,7.70020000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,7.70020000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.88250000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.88250000000,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,14.05870000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.05870000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,3.08380000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,3.08380000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.70020000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.70020000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.88250000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.88250000000,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,16.41600000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,16.41600000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,3.51990000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,3.51990000000,R2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,9.81720000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,9.81720000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,1.17210000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,1.17210000000,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,16.41600000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,16.41600000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,3.51990000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,3.51990000000,R2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.81720000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.81720000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,1.17210000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,1.17210000000,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,16.41600000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,16.41600000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,3.51990000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,3.51990000000,R2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,9.81720000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,9.81720000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,1.17210000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,1.17210000000,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,16.41600000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,16.41600000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,3.51990000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,3.51990000000,R2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.81720000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.81720000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,1.17210000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,1.17210000000,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,16.41600000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,16.41600000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,3.51990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,3.51990000000,R2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,9.81720000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,9.81720000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,1.17210000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,1.17210000000,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,16.41600000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,16.41600000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,3.51990000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,3.51990000000,R2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,9.81720000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,9.81720000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,1.17210000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,1.17210000000,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,18.62110000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,18.62110000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.95860000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.95860000000,R2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,12.31650000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,12.31650000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,1.52740000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,1.52740000000,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,18.62110000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,18.62110000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.95860000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.95860000000,R2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.31650000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.31650000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,1.52740000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,1.52740000000,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,18.62110000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,18.62110000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.95860000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.95860000000,R2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,12.31650000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,12.31650000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,1.52740000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,1.52740000000,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,18.62110000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,18.62110000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.95860000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.95860000000,R2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,12.31650000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,12.31650000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,1.52740000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,1.52740000000,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,18.62110000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,18.62110000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.95860000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.95860000000,R2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.31650000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.31650000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,1.52740000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,1.52740000000,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,18.62110000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,18.62110000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.95860000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.95860000000,R2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.31650000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.31650000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,1.52740000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,1.52740000000,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,20.86720000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,20.86720000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,4.37620000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,4.37620000000,R2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.95340000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.95340000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,1.90330000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,1.90330000000,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,20.86720000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,20.86720000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,4.37620000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,4.37620000000,R2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,14.95340000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,14.95340000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,1.90330000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,1.90330000000,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,20.86720000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,20.86720000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,4.37620000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,4.37620000000,R2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.95340000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.95340000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,1.90330000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,1.90330000000,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,20.86720000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,20.86720000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,4.37620000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,4.37620000000,R2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,14.95340000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,14.95340000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,1.90330000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,1.90330000000,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,20.86720000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,20.86720000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,4.37620000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,4.37620000000,R2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.95340000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.95340000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,1.90330000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,1.90330000000,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,20.86720000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,20.86720000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,4.37620000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,4.37620000000,R2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,14.95340000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,14.95340000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,1.90330000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,1.90330000000,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/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index 3e8507dff..46825c2a8 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,5.47740000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,1.93880000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,3.67920000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.60300000000,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,3.31120000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,0.54170000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,1.93880000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,3.67920000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.60300000000,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,3.31120000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,0.54170000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,1.93880000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,3.67920000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.60300000000,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,3.31120000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,0.54170000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,1.93880000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,3.67920000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.60300000000,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,3.31120000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,0.54170000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,1.93880000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,3.67920000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.60300000000,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.31120000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,0.54170000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,1.93880000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,3.67920000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.60300000000,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,3.31120000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,9.83130000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,0.54170000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.43810000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,4.17300000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.40300000000,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,4.17300000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,9.83130000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,0.40300000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.43810000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,4.17300000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.40300000000,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,4.17300000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,9.83130000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,0.40300000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.43810000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,4.17300000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.40300000000,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,4.17300000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,9.83130000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,0.40300000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.43810000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,4.17300000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.40300000000,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,4.17300000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,9.83130000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,0.40300000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.43810000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,4.17300000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.40300000000,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,4.17300000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,9.83130000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,0.40300000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.43810000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.17300000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.40300000000,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.17300000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,10.73400000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,0.40300000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.70360000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,4.53410000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.42070000000,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,4.53410000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,10.73400000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,0.42070000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,2.70360000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,4.53410000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.42070000000,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,4.53410000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,10.73400000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,0.42070000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,2.70360000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,4.53410000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.42070000000,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,4.53410000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,10.73400000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,0.42070000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,2.70360000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,4.53410000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.42070000000,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,4.53410000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,10.73400000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,0.42070000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,2.70360000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,4.53410000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.42070000000,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,4.53410000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,10.73400000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,0.42070000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,2.70360000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.53410000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.42070000000,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.53410000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,11.57290000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,0.42070000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,2.91140000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,4.86970000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.43460000000,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,4.86970000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,11.57290000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,0.43460000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,2.91140000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,4.86970000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.43460000000,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,4.86970000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,11.57290000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,0.43460000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,2.91140000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,4.86970000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.43460000000,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,4.86970000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,11.57290000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,0.43460000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,2.91140000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,4.86970000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.43460000000,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,4.86970000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,11.57290000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,0.43460000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,2.91140000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,4.86970000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.43460000000,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,4.86970000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,11.57290000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,0.43460000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,2.91140000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.86970000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.43460000000,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.86970000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,12.95480000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,0.43460000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,3.19260000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.42240000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.45330000000,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,5.42240000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,12.95480000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,0.45330000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.19260000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.42240000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.45330000000,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.42240000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,12.95480000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,0.45330000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.19260000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.42240000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.45330000000,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,5.42240000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,12.95480000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,0.45330000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.19260000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.42240000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.45330000000,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.42240000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,12.95480000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,0.45330000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.19260000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.42240000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.45330000000,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.42240000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,12.95480000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,0.45330000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.19260000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.42240000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.45330000000,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,5.42240000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,14.02900000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,0.45330000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.41120000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.85210000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.46790000000,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,5.85210000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,14.02900000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,0.46790000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,3.41120000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.85210000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.46790000000,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.85210000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,14.02900000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,0.46790000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,3.41120000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.85210000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.46790000000,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,5.85210000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,14.02900000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,0.46790000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,3.41120000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.85210000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.46790000000,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.85210000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,14.02900000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,0.46790000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,3.41120000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.85210000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.46790000000,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,5.85210000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,14.02900000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,0.46790000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,3.41120000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.85210000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.46790000000,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,5.85210000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,0.46790000000,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 aba9340e5..4d4c083f1 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,3.98810000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,1.92920000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.91770000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.81840000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.21000000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,3.98810000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,1.92920000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.91770000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.81840000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.21000000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,3.98810000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,1.92920000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.91770000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.81840000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.21000000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,3.98810000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,1.92920000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.91770000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.81840000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.21000000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,3.98810000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,1.92920000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.91770000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.81840000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.21000000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,3.98810000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,1.92920000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.91770000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.81840000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.21000000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,7.92640000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.29370000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,3.41110000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.39340000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.17000000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.92640000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.29370000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,3.41110000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.39340000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.17000000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,7.92640000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.29370000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,3.41110000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.39340000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.17000000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.92640000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.29370000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,3.41110000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.39340000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.17000000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,7.92640000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.29370000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.41110000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.39340000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.17000000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,7.92640000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.29370000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,3.41110000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.39340000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.17000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,7.67600000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,2.34640000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,3.31090000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.39690000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.67600000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,2.34640000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,3.31090000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.39690000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,7.67600000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,2.34640000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,3.31090000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.39690000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.67600000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,2.34640000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,3.31090000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.39690000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,7.67600000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,2.34640000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.31090000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.39690000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,7.67600000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,2.34640000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,3.31090000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.39690000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv index 3aa01963a..691f5214e 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv @@ -1,91 +1,91 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year gas,all-week,night,all-year,R1,1.16000000000,0,MUS$2010/PJ,2020 heat,all-week,night,all-year,R1,1.00000000000,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,R1,64.71000000000,0,MUS$2010/kt,2020 +CO2f,all-week,night,all-year,R1,10.78500000000,0,MUS$2010/kt,2020 gas,all-week,morning,all-year,R1,1.74000000000,1,MUS$2010/PJ,2020 heat,all-week,morning,all-year,R1,1.50000000000,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,R1,97.06500000000,1,MUS$2010/kt,2020 +CO2f,all-week,morning,all-year,R1,16.17750000000,1,MUS$2010/kt,2020 gas,all-week,afternoon,all-year,R1,1.16000000000,2,MUS$2010/PJ,2020 heat,all-week,afternoon,all-year,R1,1.00000000000,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,R1,64.71000000000,2,MUS$2010/kt,2020 +CO2f,all-week,afternoon,all-year,R1,10.78500000000,2,MUS$2010/kt,2020 gas,all-week,early-peak,all-year,R1,1.74000000000,3,MUS$2010/PJ,2020 heat,all-week,early-peak,all-year,R1,1.50000000000,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,R1,97.06500000000,3,MUS$2010/kt,2020 +CO2f,all-week,early-peak,all-year,R1,16.17750000000,3,MUS$2010/kt,2020 gas,all-week,late-peak,all-year,R1,1.93330000000,4,MUS$2010/PJ,2020 heat,all-week,late-peak,all-year,R1,1.66670000000,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,R1,107.85000000000,4,MUS$2010/kt,2020 +CO2f,all-week,late-peak,all-year,R1,17.97500000000,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,R1,1.93330000000,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,R1,1.66670000000,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,R1,107.85000000000,5,MUS$2010/kt,2020 +CO2f,all-week,evening,all-year,R1,17.97500000000,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,R1,0.42220000000,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,R1,0.40920000000,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,R1,1.33330000000,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,R1,22.74690000000,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,R1,3.79110000000,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,R1,0.63330000000,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,R1,0.61370000000,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,R1,2.00000000000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,R1,34.12030000000,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,R1,5.68670000000,1,MUS$2010/kt,2025 electricity,all-week,afternoon,all-year,R1,0.42220000000,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,R1,0.40920000000,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,R1,1.33330000000,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,R1,22.74690000000,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,R1,3.79110000000,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,R1,0.63330000000,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,R1,0.61370000000,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,R1,2.00000000000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,R1,34.12030000000,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,R1,5.68670000000,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,R1,1.21670000000,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,R1,1.21720000000,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,R1,4.00000000000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,R1,67.67550000000,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,R1,11.27920000000,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,R1,0.84440000000,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,R1,0.81830000000,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,R1,2.66670000000,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,R1,45.49370000000,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,R1,7.58230000000,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,R1,0.66670000000,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,R1,0.45960000000,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,R1,1.66670000000,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,R1,25.23030000000,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,R1,4.20500000000,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,R1,1.00000000000,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,R1,0.68940000000,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,R1,2.50000000000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,R1,37.84540000000,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,R1,6.30760000000,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,R1,0.66670000000,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,R1,0.45960000000,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,R1,1.66670000000,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,R1,25.23030000000,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,R1,4.20500000000,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,R1,1.00000000000,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,R1,0.68940000000,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,R1,2.50000000000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,R1,37.84540000000,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,R1,6.30760000000,3,MUS$2010/kt,2030 electricity,all-week,late-peak,all-year,R1,1.81670000000,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,R1,1.25250000000,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,R1,4.83330000000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,R1,68.75250000000,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,R1,11.45870000000,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,R1,1.33330000000,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,R1,0.91930000000,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,R1,50.46060000000,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,R1,8.41010000000,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,R1,0.80000000000,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,R1,0.42640000000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,R1,23.40510000000,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,R1,3.90090000000,0,MUS$2010/kt,2035 electricity,all-week,morning,all-year,R1,1.20000000000,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,R1,0.63960000000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,R1,35.10770000000,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,R1,5.85130000000,1,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,R1,0.80000000000,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,R1,0.42640000000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,R1,23.40510000000,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,R1,3.90090000000,2,MUS$2010/kt,2035 electricity,all-week,early-peak,all-year,R1,1.20000000000,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,R1,0.63960000000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,R1,35.10770000000,3,MUS$2010/kt,2035 +CO2f,all-week,early-peak,all-year,R1,5.85130000000,3,MUS$2010/kt,2035 electricity,all-week,late-peak,all-year,R1,2.35000000000,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,R1,1.25250000000,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,R1,6.00000000000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,R1,68.75250000000,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,R1,11.45870000000,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,R1,1.60000000000,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,R1,0.85280000000,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,R1,46.81020000000,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,R1,7.80170000000,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml index 24815755c..9874ee445 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml @@ -29,7 +29,7 @@ sink = "aggregate" filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv" [carbon_budget_control] -budget = [300, 300, 300, 300] +budget = [50, 50, 50, 50] commodities = ["CO2f"] method = "bisection" control_undershoot = false diff --git a/docs/tutorial-code/carbon-budget/generate_models.py b/docs/tutorial-code/carbon-budget/generate_models.py index a548dd7d0..960da566a 100644 --- a/docs/tutorial-code/carbon-budget/generate_models.py +++ b/docs/tutorial-code/carbon-budget/generate_models.py @@ -44,7 +44,7 @@ def generate_model_1() -> None: # Add carbon budget carbon_budget_settings = { - "budget": [300, 300, 300, 300], + "budget": [50, 50, 50, 50], "commodities": ["CO2f"], "method": "bisection", "control_undershoot": False, 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 a560bcff2..dd19fb1ea 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,2.31520000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,0.91100000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,3.25460000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.56480000000,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,2.31520000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,0.91100000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,3.25460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.56480000000,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,3.16500000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,1.03690000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,3.82100000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.57970000000,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,2.31520000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,0.91100000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,3.25460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.56480000000,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,2.31520000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,0.91100000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,3.25460000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.56480000000,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,2.82650000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,0.98680000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,3.59540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.57370000000,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,0.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.28490000000,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/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index e765e8f11..34d5ad617 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -1,22 +1,22 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year 0,10,electricity,all-week,night,2020,all-year,R1,0.06030000000,gasCCGT,0,MUS$2010/PJ,2025 1,10,electricity,all-week,night,2020,all-year,R1,0.36190000000,windturbine,0,MUS$2010/PJ,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,5.52930000000,gasCCGT,0,MUS$2010/kt,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,0.92160000000,gasCCGT,0,MUS$2010/kt,2025 0,10,electricity,all-week,morning,2020,all-year,R1,0.09050000000,gasCCGT,1,MUS$2010/PJ,2025 1,10,electricity,all-week,morning,2020,all-year,R1,0.54290000000,windturbine,1,MUS$2010/PJ,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,8.29400000000,gasCCGT,1,MUS$2010/kt,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,1.38230000000,gasCCGT,1,MUS$2010/kt,2025 0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025 1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36190000000,windturbine,2,MUS$2010/PJ,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,1.52780000000,gasCCGT,2,MUS$2010/kt,2025 0,10,electricity,all-week,early-peak,2020,all-year,R1,0.09050000000,gasCCGT,3,MUS$2010/PJ,2025 1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54290000000,windturbine,3,MUS$2010/PJ,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,8.29400000000,gasCCGT,3,MUS$2010/kt,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,1.38230000000,gasCCGT,3,MUS$2010/kt,2025 0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025 1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,2.54640000000,gasCCGT,4,MUS$2010/kt,2025 0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 1,10,electricity,all-week,evening,2020,all-year,R1,0.72380000000,windturbine,5,MUS$2010/PJ,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,2.54640000000,gasCCGT,5,MUS$2010/kt,2025 1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,MUS$2010/PJ,2030 2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,MUS$2010/PJ,2030 1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,MUS$2010/PJ,2030 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 9d33aaf90..307cd8986 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,2.10910000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,0.88040000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,3.11720000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.56120000000,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,2.10910000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,0.88040000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,3.11720000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.56120000000,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,3.12480000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,1.03100000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,3.79420000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.57900000000,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,2.10910000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,0.88040000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,3.11720000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.56120000000,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,1.46340000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,0.80810000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,2.67720000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.55080000000,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,1.46340000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,0.80810000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,2.67720000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.55080000000,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,0.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.28490000000,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/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 27829bc3c..1fb7239c7 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -1,22 +1,22 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year 0,10,electricity,all-week,night,2020,all-year,R1,0.05280000000,gasCCGT,0,MUS$2010/PJ,2025 1,10,electricity,all-week,night,2020,all-year,R1,0.36940000000,windturbine,0,MUS$2010/PJ,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,4.83810000000,gasCCGT,0,MUS$2010/kt,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,0.80640000000,gasCCGT,0,MUS$2010/kt,2025 0,10,electricity,all-week,morning,2020,all-year,R1,0.07920000000,gasCCGT,1,MUS$2010/PJ,2025 1,10,electricity,all-week,morning,2020,all-year,R1,0.55420000000,windturbine,1,MUS$2010/PJ,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,7.25720000000,gasCCGT,1,MUS$2010/kt,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,1.20950000000,gasCCGT,1,MUS$2010/kt,2025 0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025 1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36940000000,windturbine,2,MUS$2010/PJ,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,1.52780000000,gasCCGT,2,MUS$2010/kt,2025 0,10,electricity,all-week,early-peak,2020,all-year,R1,0.07920000000,gasCCGT,3,MUS$2010/PJ,2025 1,10,electricity,all-week,early-peak,2020,all-year,R1,0.55420000000,windturbine,3,MUS$2010/PJ,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.25720000000,gasCCGT,3,MUS$2010/kt,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,1.20950000000,gasCCGT,3,MUS$2010/kt,2025 0,10,electricity,all-week,late-peak,2020,all-year,R1,0.08330000000,gasCCGT,4,MUS$2010/PJ,2025 1,10,electricity,all-week,late-peak,2020,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,7.63920000000,gasCCGT,4,MUS$2010/kt,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,1.27320000000,gasCCGT,4,MUS$2010/kt,2025 0,10,electricity,all-week,evening,2020,all-year,R1,0.05630000000,gasCCGT,5,MUS$2010/PJ,2025 1,10,electricity,all-week,evening,2020,all-year,R1,0.78810000000,windturbine,5,MUS$2010/PJ,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,5.16070000000,gasCCGT,5,MUS$2010/kt,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,0.86010000000,gasCCGT,5,MUS$2010/kt,2025 1,10,electricity,all-week,night,2020,all-year,R1,0.42420000000,windturbine,0,MUS$2010/PJ,2030 2,10,electricity,all-week,night,2025,all-year,R1,0.24240000000,windturbine,0,MUS$2010/PJ,2030 1,10,electricity,all-week,morning,2020,all-year,R1,0.63640000000,windturbine,1,MUS$2010/PJ,2030 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 42ef4fa7d..05f1180f0 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,9.99700000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,1.69370000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,5.10610000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.45480000000,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.99700000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,1.69370000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,5.10610000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.45480000000,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,9.99700000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,1.69370000000,R1,2,MUS$2010/PJ,2025 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,5.10610000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,0.45480000000,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,9.99700000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,1.69370000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,5.10610000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.45480000000,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.99700000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,1.69370000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.10610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.45480000000,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,9.99700000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,1.69370000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,5.10610000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.45480000000,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,9.99700000000,R1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,1.69370000000,R1,6,MUS$2010/PJ,2025 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,5.10610000000,R1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,0.45480000000,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,9.99700000000,R1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,1.69370000000,R1,7,MUS$2010/PJ,2025 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,5.10610000000,R1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,0.45480000000,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,13.80430000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.11110000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.70210000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.28590000000,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,13.80430000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.11110000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.70210000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.28590000000,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,13.80430000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,2.11110000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,5.70210000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,0.28590000000,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,13.80430000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.11110000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.70210000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.28590000000,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.80430000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.11110000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.70210000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.28590000000,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.80430000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.11110000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.70210000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.28590000000,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,13.80430000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,2.11110000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,5.70210000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,0.28590000000,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,13.80430000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,2.11110000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,5.70210000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,0.28590000000,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,15.89730000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,2.48080000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.53930000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.30440000000,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,15.89730000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,2.48080000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.53930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.30440000000,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,15.89730000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,2.48080000000,R1,2,MUS$2010/PJ,2035 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,6.53930000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,0.30440000000,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,15.89730000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,2.48080000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.53930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.30440000000,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,15.89730000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,2.48080000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.53930000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.30440000000,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.89730000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,2.48080000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.53930000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.30440000000,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,15.89730000000,R1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,2.48080000000,R1,6,MUS$2010/PJ,2035 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,6.53930000000,R1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,0.30440000000,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,15.89730000000,R1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,2.48080000000,R1,7,MUS$2010/PJ,2035 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,6.53930000000,R1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,0.30440000000,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,17.01820000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,2.71380000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.98760000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.31610000000,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.01820000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,2.71380000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.98760000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.31610000000,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,17.01820000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,2.71380000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,6.98760000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,0.31610000000,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,17.01820000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,2.71380000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.98760000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.31610000000,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,17.01820000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,2.71380000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.98760000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.31610000000,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,17.01820000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,2.71380000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.98760000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.31610000000,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,17.01820000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,2.71380000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,6.98760000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,0.31610000000,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,17.01820000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,2.71380000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,6.98760000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,0.31610000000,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,19.42660000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.07290000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.95100000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.33400000000,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.42660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.07290000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.95100000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.33400000000,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,19.42660000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,3.07290000000,R1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,7.95100000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,0.33400000000,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,19.42660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.07290000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.95100000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.33400000000,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,19.42660000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.07290000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.95100000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.33400000000,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,19.42660000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.07290000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.95100000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.33400000000,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,19.42660000000,R1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,3.07290000000,R1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,7.95100000000,R1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,0.33400000000,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,19.42660000000,R1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,3.07290000000,R1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,7.95100000000,R1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,0.33400000000,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,20.93710000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,3.31580000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.55520000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.34620000000,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.93710000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,3.31580000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.55520000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.34620000000,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,20.93710000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,3.31580000000,R1,2,MUS$2010/PJ,2050 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,8.55520000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,0.34620000000,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.93710000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,3.31580000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.55520000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.34620000000,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,20.93710000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,3.31580000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.55520000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.34620000000,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,20.93710000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,3.31580000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.55520000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.34620000000,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,20.93710000000,R1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,3.31580000000,R1,6,MUS$2010/PJ,2050 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,8.55520000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,0.34620000000,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,20.93710000000,R1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,3.31580000000,R1,7,MUS$2010/PJ,2050 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,8.55520000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,0.34620000000,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/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 627e0edce..1d2db95d3 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,6.68740000000,R1,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,1.43110000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,4.52640000000,R1,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,0.53350000000,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,6.68740000000,R1,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,1.43110000000,R1,1,MUS$2010/PJ,2022 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,4.52640000000,R1,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,0.53350000000,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,6.68740000000,R1,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,1.43110000000,R1,2,MUS$2010/PJ,2022 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,4.52640000000,R1,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,0.53350000000,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,6.68740000000,R1,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,1.43110000000,R1,3,MUS$2010/PJ,2022 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,4.52640000000,R1,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,0.53350000000,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,6.68740000000,R1,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,1.43110000000,R1,4,MUS$2010/PJ,2022 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,4.52640000000,R1,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,0.53350000000,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,6.68740000000,R1,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,1.43110000000,R1,5,MUS$2010/PJ,2022 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,4.52640000000,R1,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,0.53350000000,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,6.68740000000,R1,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,1.43110000000,R1,6,MUS$2010/PJ,2022 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,4.52640000000,R1,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,0.53350000000,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,6.68740000000,R1,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,1.43110000000,R1,7,MUS$2010/PJ,2022 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,4.52640000000,R1,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,0.53350000000,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,8.18260000000,R1,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,1.56680000000,R1,0,MUS$2010/PJ,2024 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,4.68950000000,R1,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,0.48200000000,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,8.18260000000,R1,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,1.56680000000,R1,1,MUS$2010/PJ,2024 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,4.68950000000,R1,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,0.48200000000,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,8.18260000000,R1,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,1.56680000000,R1,2,MUS$2010/PJ,2024 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,4.68950000000,R1,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,0.48200000000,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,8.18260000000,R1,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,1.56680000000,R1,3,MUS$2010/PJ,2024 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,4.68950000000,R1,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,0.48200000000,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,8.18260000000,R1,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,1.56680000000,R1,4,MUS$2010/PJ,2024 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,4.68950000000,R1,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,0.48200000000,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,8.18260000000,R1,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,1.56680000000,R1,5,MUS$2010/PJ,2024 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,4.68950000000,R1,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,0.48200000000,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,8.18260000000,R1,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,1.56680000000,R1,6,MUS$2010/PJ,2024 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,4.68950000000,R1,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,0.48200000000,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,8.18260000000,R1,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,1.56680000000,R1,7,MUS$2010/PJ,2024 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,4.68950000000,R1,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,0.48200000000,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,9.63610000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,1.71250000000,R1,0,MUS$2010/PJ,2026 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,4.85240000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,0.42140000000,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,9.63610000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,1.71250000000,R1,1,MUS$2010/PJ,2026 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,4.85240000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,0.42140000000,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,9.63610000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,1.71250000000,R1,2,MUS$2010/PJ,2026 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,4.85240000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,0.42140000000,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,9.63610000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,1.71250000000,R1,3,MUS$2010/PJ,2026 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,4.85240000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,0.42140000000,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,9.63610000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,1.71250000000,R1,4,MUS$2010/PJ,2026 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,4.85240000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,0.42140000000,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,9.63610000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,1.71250000000,R1,5,MUS$2010/PJ,2026 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,4.85240000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,0.42140000000,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,9.63610000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,1.71250000000,R1,6,MUS$2010/PJ,2026 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,4.85240000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,0.42140000000,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,9.63610000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,1.71250000000,R1,7,MUS$2010/PJ,2026 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,4.85240000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,0.42140000000,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,11.65880000000,R1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,1.90140000000,R1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,5.23170000000,R1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,0.35570000000,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,11.65880000000,R1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,1.90140000000,R1,1,MUS$2010/PJ,2028 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,5.23170000000,R1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,0.35570000000,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,11.65880000000,R1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,1.90140000000,R1,2,MUS$2010/PJ,2028 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,5.23170000000,R1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,0.35570000000,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,11.65880000000,R1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,1.90140000000,R1,3,MUS$2010/PJ,2028 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,5.23170000000,R1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,0.35570000000,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,11.65880000000,R1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,1.90140000000,R1,4,MUS$2010/PJ,2028 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,5.23170000000,R1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,0.35570000000,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,11.65880000000,R1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,1.90140000000,R1,5,MUS$2010/PJ,2028 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,5.23170000000,R1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,0.35570000000,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,11.65880000000,R1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,1.90140000000,R1,6,MUS$2010/PJ,2028 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,5.23170000000,R1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,0.35570000000,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,11.65880000000,R1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,1.90140000000,R1,7,MUS$2010/PJ,2028 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,5.23170000000,R1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,0.35570000000,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,13.20130000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.06970000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.46090000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.28390000000,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,13.20130000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.06970000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.46090000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.28390000000,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,13.20130000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,2.06970000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,5.46090000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,0.28390000000,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,13.20130000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.06970000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.46090000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.28390000000,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.20130000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.06970000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.46090000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.28390000000,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.20130000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.06970000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.46090000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.28390000000,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,13.20130000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,2.06970000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,5.46090000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,0.28390000000,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,13.20130000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,2.06970000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,5.46090000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,0.28390000000,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,15.19460000000,R1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,2.30950000000,R1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,6.25820000000,R1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,0.29590000000,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,15.19460000000,R1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,2.30950000000,R1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,6.25820000000,R1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,0.29590000000,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,15.19460000000,R1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,2.30950000000,R1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,6.25820000000,R1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,0.29590000000,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,15.19460000000,R1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,2.30950000000,R1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,6.25820000000,R1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,0.29590000000,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,15.19460000000,R1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,2.30950000000,R1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,6.25820000000,R1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,0.29590000000,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.19460000000,R1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,2.30950000000,R1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,6.25820000000,R1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,0.29590000000,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.19460000000,R1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,2.30950000000,R1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,6.25820000000,R1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,0.29590000000,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.19460000000,R1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,2.30950000000,R1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,6.25820000000,R1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,0.29590000000,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,17.20670000000,R1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,2.55300000000,R1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,7.06300000000,R1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,0.30800000000,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,17.20670000000,R1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,2.55300000000,R1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,7.06300000000,R1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,0.30800000000,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,17.20670000000,R1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,2.55300000000,R1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,7.06300000000,R1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,0.30800000000,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,17.20670000000,R1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,2.55300000000,R1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,7.06300000000,R1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,0.30800000000,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,17.20670000000,R1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,2.55300000000,R1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,7.06300000000,R1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,0.30800000000,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,17.20670000000,R1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,2.55300000000,R1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,7.06300000000,R1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,0.30800000000,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,17.20670000000,R1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,2.55300000000,R1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,7.06300000000,R1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,0.30800000000,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,17.20670000000,R1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,2.55300000000,R1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,7.06300000000,R1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,0.30800000000,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,17.48410000000,R1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,2.64870000000,R1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,7.17400000000,R1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,0.31280000000,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,17.48410000000,R1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,2.64870000000,R1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,7.17400000000,R1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,0.31280000000,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,17.48410000000,R1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,2.64870000000,R1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,7.17400000000,R1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,0.31280000000,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,17.48410000000,R1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,2.64870000000,R1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,7.17400000000,R1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,0.31280000000,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,17.48410000000,R1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,2.64870000000,R1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,7.17400000000,R1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,0.31280000000,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,17.48410000000,R1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,2.64870000000,R1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,7.17400000000,R1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,0.31280000000,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,17.48410000000,R1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,2.64870000000,R1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,7.17400000000,R1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,0.31280000000,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,17.48410000000,R1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,2.64870000000,R1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,7.17400000000,R1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,0.31280000000,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,18.17390000000,R1,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,2.76990000000,R1,0,MUS$2010/PJ,2038 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,7.45000000000,R1,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,0.31890000000,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,18.17390000000,R1,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,2.76990000000,R1,1,MUS$2010/PJ,2038 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,7.45000000000,R1,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,0.31890000000,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,18.17390000000,R1,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,2.76990000000,R1,2,MUS$2010/PJ,2038 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,7.45000000000,R1,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,0.31890000000,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,18.17390000000,R1,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,2.76990000000,R1,3,MUS$2010/PJ,2038 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,7.45000000000,R1,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,0.31890000000,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,18.17390000000,R1,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,2.76990000000,R1,4,MUS$2010/PJ,2038 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,7.45000000000,R1,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,0.31890000000,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,18.17390000000,R1,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,2.76990000000,R1,5,MUS$2010/PJ,2038 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,7.45000000000,R1,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,0.31890000000,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,18.17390000000,R1,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,2.76990000000,R1,6,MUS$2010/PJ,2038 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,7.45000000000,R1,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,0.31890000000,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,18.17390000000,R1,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,2.76990000000,R1,7,MUS$2010/PJ,2038 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,7.45000000000,R1,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,0.31890000000,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,18.79120000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,2.87840000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.69680000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.32430000000,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,18.79120000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,2.87840000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,7.69680000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.32430000000,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,18.79120000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,2.87840000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,7.69680000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,0.32430000000,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,18.79120000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,2.87840000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,7.69680000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.32430000000,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,18.79120000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,2.87840000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,7.69680000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.32430000000,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,18.79120000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,2.87840000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.69680000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.32430000000,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,18.79120000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,2.87840000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,7.69680000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,0.32430000000,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,18.79120000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,2.87840000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,7.69680000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,0.32430000000,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/new-decision-metric/Results/MCAMetric_Supply.csv b/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv index cdf8c23d2..e762b582f 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv @@ -1,16 +1,16 @@ agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,10.78500000000,gasboiler,0,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,16.17750000000,gasboiler,1,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,10.78500000000,gasboiler,2,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,16.17750000000,gasboiler,3,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,1.66666666667,gasboiler,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,107.85000000000,gasboiler,4,MUS$2010/kt,2020 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,17.97500000000,gasboiler,4,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,1.66666666667,gasboiler,5,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,107.85000000000,gasboiler,5,MUS$2010/kt,2020 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,17.97500000000,gasboiler,5,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020 @@ -19,46 +19,46 @@ A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.933 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,1.93333333333,gassupply1,5,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,2.99583333333,gasboiler,0,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,4.49375000000,gasboiler,1,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,2.99583333333,gasboiler,2,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,4.49375000000,gasboiler,3,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,8.98750000000,gasboiler,4,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,5.99166666667,gasboiler,5,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.10270270270,gasCCGT,0,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22822822823,solarPV,0,MUS$2010/PJ,2025 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09129129129,windturbine,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,9.41475675676,gasCCGT,0,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,1.56912612613,gasCCGT,0,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.15405405405,gasCCGT,1,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34234234234,solarPV,1,MUS$2010/PJ,2025 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13693693694,windturbine,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,14.12213513514,gasCCGT,1,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,2.35368918919,gasCCGT,1,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.10270270270,gasCCGT,2,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22822822823,solarPV,2,MUS$2010/PJ,2025 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09129129129,windturbine,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,9.41475675676,gasCCGT,2,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,1.56912612613,gasCCGT,2,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.15405405405,gasCCGT,3,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34234234234,solarPV,3,MUS$2010/PJ,2025 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13693693694,windturbine,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,14.12213513514,gasCCGT,3,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,2.35368918919,gasCCGT,3,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.30000000000,gasCCGT,4,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2025 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,27.50100000000,gasCCGT,4,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,4.58350000000,gasCCGT,4,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.20540540541,gasCCGT,5,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45645645646,solarPV,5,MUS$2010/PJ,2025 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18258258258,windturbine,5,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,18.82951351351,gasCCGT,5,MUS$2010/kt,2025 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,3.13825225225,gasCCGT,5,MUS$2010/kt,2025 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.49373573574,gassupply1,0,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.74060360360,gassupply1,1,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.49373573574,gassupply1,2,MUS$2010/PJ,2025 @@ -82,43 +82,43 @@ A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09523809524,windturbine,0,MUS$2010/PJ,2030 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.16071428571,gasCCGT,0,MUS$2010/PJ,2030 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11904761905,solarPV,0,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.91089285714,gasCCGT,0,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.73267857143,gasCCGT,0,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,0.81848214286,gasCCGT,0,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,2.45544642857,gasCCGT,0,MUS$2010/kt,2030 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.08035714286,gasCCGT,1,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35714285714,solarPV,1,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.14285714286,windturbine,1,MUS$2010/PJ,2030 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.24107142857,gasCCGT,1,MUS$2010/PJ,2030 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17857142857,solarPV,1,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.36633928571,gasCCGT,1,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,22.09901785714,gasCCGT,1,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,1.22772321429,gasCCGT,1,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,3.68316964286,gasCCGT,1,MUS$2010/kt,2030 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05357142857,gasCCGT,2,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23809523810,solarPV,2,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09523809524,windturbine,2,MUS$2010/PJ,2030 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.16071428571,gasCCGT,2,MUS$2010/PJ,2030 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11904761905,solarPV,2,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.91089285714,gasCCGT,2,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.73267857143,gasCCGT,2,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,0.81848214286,gasCCGT,2,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,2.45544642857,gasCCGT,2,MUS$2010/kt,2030 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.08035714286,gasCCGT,3,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35714285714,solarPV,3,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.14285714286,windturbine,3,MUS$2010/PJ,2030 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.24107142857,gasCCGT,3,MUS$2010/PJ,2030 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17857142857,solarPV,3,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.36633928571,gasCCGT,3,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,22.09901785714,gasCCGT,3,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,1.22772321429,gasCCGT,3,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,3.68316964286,gasCCGT,3,MUS$2010/kt,2030 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2030 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2030 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,2.29175000000,gasCCGT,4,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,6.87525000000,gasCCGT,4,MUS$2010/kt,2030 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10714285714,gasCCGT,5,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47619047619,solarPV,5,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.19047619048,windturbine,5,MUS$2010/PJ,2030 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.32142857143,gasCCGT,5,MUS$2010/PJ,2030 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.23809523810,solarPV,5,MUS$2010/PJ,2030 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.82178571429,gasCCGT,5,MUS$2010/kt,2030 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,29.46535714286,gasCCGT,5,MUS$2010/kt,2030 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,1.63696428571,gasCCGT,5,MUS$2010/kt,2030 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,4.91089285714,gasCCGT,5,MUS$2010/kt,2030 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.35785714286,gassupply1,0,MUS$2010/PJ,2030 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.53678571429,gassupply1,1,MUS$2010/PJ,2030 A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.35785714286,gassupply1,2,MUS$2010/PJ,2030 @@ -143,48 +143,48 @@ A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2035 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2035 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.17777777778,solarPV,0,MUS$2010/PJ,2035 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2035 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,0.76391666667,gasCCGT,0,MUS$2010/kt,2035 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,2.29175000000,gasCCGT,0,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2035 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2035 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.26666666667,solarPV,1,MUS$2010/PJ,2035 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2035 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,1.14587500000,gasCCGT,1,MUS$2010/kt,2035 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,3.43762500000,gasCCGT,1,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2035 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2035 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.17777777778,solarPV,2,MUS$2010/PJ,2035 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2035 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,0.76391666667,gasCCGT,2,MUS$2010/kt,2035 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,2.29175000000,gasCCGT,2,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2035 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2035 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.26666666667,solarPV,3,MUS$2010/PJ,2035 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2035 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,1.14587500000,gasCCGT,3,MUS$2010/kt,2035 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,3.43762500000,gasCCGT,3,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2035 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2035 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2035 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2035 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,2.29175000000,gasCCGT,4,MUS$2010/kt,2035 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,6.87525000000,gasCCGT,4,MUS$2010/kt,2035 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2035 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2035 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2035 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2035 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.35555555556,solarPV,5,MUS$2010/PJ,2035 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2035 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2035 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,1.52783333333,gasCCGT,5,MUS$2010/kt,2035 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,4.58350000000,gasCCGT,5,MUS$2010/kt,2035 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2035 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2035 @@ -210,8 +210,8 @@ A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.18211382114,solarPV,0,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.69529268293,gasCCGT,0,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.08587804878,gasCCGT,0,MUS$2010/kt,2040 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,0.78254878049,gasCCGT,0,MUS$2010/kt,2040 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,2.34764634146,gasCCGT,0,MUS$2010/kt,2040 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07682926829,gasCCGT,1,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34146341463,solarPV,1,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13658536585,windturbine,1,MUS$2010/PJ,2040 @@ -219,8 +219,8 @@ A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,pow A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.27317073171,solarPV,1,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.04293902439,gasCCGT,1,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.12881707317,gasCCGT,1,MUS$2010/kt,2040 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,1.17382317073,gasCCGT,1,MUS$2010/kt,2040 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,3.52146951220,gasCCGT,1,MUS$2010/kt,2040 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05121951220,gasCCGT,2,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22764227642,solarPV,2,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09105691057,windturbine,2,MUS$2010/PJ,2040 @@ -228,8 +228,8 @@ A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,p A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.18211382114,solarPV,2,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.69529268293,gasCCGT,2,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.08587804878,gasCCGT,2,MUS$2010/kt,2040 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,0.78254878049,gasCCGT,2,MUS$2010/kt,2040 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,2.34764634146,gasCCGT,2,MUS$2010/kt,2040 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07682926829,gasCCGT,3,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34146341463,solarPV,3,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13658536585,windturbine,3,MUS$2010/PJ,2040 @@ -237,8 +237,8 @@ A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1, A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.27317073171,solarPV,3,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.04293902439,gasCCGT,3,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.12881707317,gasCCGT,3,MUS$2010/kt,2040 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,1.17382317073,gasCCGT,3,MUS$2010/kt,2040 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,3.52146951220,gasCCGT,3,MUS$2010/kt,2040 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2040 @@ -246,8 +246,8 @@ A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,p A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2040 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2040 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2040 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,2.29175000000,gasCCGT,4,MUS$2010/kt,2040 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,6.87525000000,gasCCGT,4,MUS$2010/kt,2040 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10243902439,gasCCGT,5,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45528455285,solarPV,5,MUS$2010/PJ,2040 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18211382114,windturbine,5,MUS$2010/PJ,2040 @@ -255,8 +255,8 @@ A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,pow A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040 A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.36422764228,solarPV,5,MUS$2010/PJ,2040 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.39058536585,gasCCGT,5,MUS$2010/kt,2040 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.17175609756,gasCCGT,5,MUS$2010/kt,2040 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,1.56509756098,gasCCGT,5,MUS$2010/kt,2040 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,4.69529268293,gasCCGT,5,MUS$2010/kt,2040 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.34214634146,gassupply1,0,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.51321951220,gassupply1,1,MUS$2010/PJ,2040 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.34214634146,gassupply1,2,MUS$2010/PJ,2040 @@ -283,8 +283,8 @@ A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.17777777778,solarPV,0,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2045 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2045 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,0.76391666667,gasCCGT,0,MUS$2010/kt,2045 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,2.29175000000,gasCCGT,0,MUS$2010/kt,2045 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2045 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2045 @@ -293,8 +293,8 @@ A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,pow A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.26666666667,solarPV,1,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2045 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2045 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,1.14587500000,gasCCGT,1,MUS$2010/kt,2045 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,3.43762500000,gasCCGT,1,MUS$2010/kt,2045 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2045 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2045 @@ -303,8 +303,8 @@ A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,p A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.17777777778,solarPV,2,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2045 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2045 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,0.76391666667,gasCCGT,2,MUS$2010/kt,2045 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,2.29175000000,gasCCGT,2,MUS$2010/kt,2045 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2045 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2045 @@ -313,8 +313,8 @@ A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1, A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.26666666667,solarPV,3,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2045 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2045 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,1.14587500000,gasCCGT,3,MUS$2010/kt,2045 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,3.43762500000,gasCCGT,3,MUS$2010/kt,2045 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2045 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2045 @@ -323,8 +323,8 @@ A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,p A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2045 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2045 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,2.29175000000,gasCCGT,4,MUS$2010/kt,2045 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,6.87525000000,gasCCGT,4,MUS$2010/kt,2045 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2045 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2045 A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2045 @@ -333,8 +333,8 @@ A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,pow A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.35555555556,solarPV,5,MUS$2010/PJ,2045 A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2045 A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2045 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2045 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,1.52783333333,gasCCGT,5,MUS$2010/kt,2045 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,4.58350000000,gasCCGT,5,MUS$2010/kt,2045 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2045 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2045 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2045 @@ -361,8 +361,8 @@ A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.23076923077,solarPV,0,MUS$2010/PJ,2050 A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.18461538462,windturbine,0,MUS$2010/PJ,2050 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.75978846154,gasCCGT,0,MUS$2010/kt,2050 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.27936538462,gasCCGT,0,MUS$2010/kt,2050 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,0.79329807692,gasCCGT,0,MUS$2010/kt,2050 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,2.37989423077,gasCCGT,0,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07788461538,gasCCGT,1,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23365384615,gasCCGT,1,MUS$2010/PJ,2050 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17307692308,solarPV,1,MUS$2010/PJ,2050 @@ -371,8 +371,8 @@ A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,pow A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.34615384615,solarPV,1,MUS$2010/PJ,2050 A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.27692307692,windturbine,1,MUS$2010/PJ,2050 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.13968269231,gasCCGT,1,MUS$2010/kt,2050 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.41904807692,gasCCGT,1,MUS$2010/kt,2050 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,1.18994711538,gasCCGT,1,MUS$2010/kt,2050 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,3.56984134615,gasCCGT,1,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05192307692,gasCCGT,2,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15576923077,gasCCGT,2,MUS$2010/PJ,2050 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11538461538,solarPV,2,MUS$2010/PJ,2050 @@ -381,8 +381,8 @@ A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,p A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.23076923077,solarPV,2,MUS$2010/PJ,2050 A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.18461538462,windturbine,2,MUS$2010/PJ,2050 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.75978846154,gasCCGT,2,MUS$2010/kt,2050 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.27936538462,gasCCGT,2,MUS$2010/kt,2050 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,0.79329807692,gasCCGT,2,MUS$2010/kt,2050 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,2.37989423077,gasCCGT,2,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07788461538,gasCCGT,3,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23365384615,gasCCGT,3,MUS$2010/PJ,2050 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17307692308,solarPV,3,MUS$2010/PJ,2050 @@ -391,8 +391,8 @@ A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1, A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.34615384615,solarPV,3,MUS$2010/PJ,2050 A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.27692307692,windturbine,3,MUS$2010/PJ,2050 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.13968269231,gasCCGT,3,MUS$2010/kt,2050 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.41904807692,gasCCGT,3,MUS$2010/kt,2050 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,1.18994711538,gasCCGT,3,MUS$2010/kt,2050 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,3.56984134615,gasCCGT,3,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2050 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2050 @@ -401,8 +401,8 @@ A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,p A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2050 A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.53333333333,windturbine,4,MUS$2010/PJ,2050 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2050 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2050 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,2.29175000000,gasCCGT,4,MUS$2010/kt,2050 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,6.87525000000,gasCCGT,4,MUS$2010/kt,2050 A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10384615385,gasCCGT,5,MUS$2010/PJ,2050 A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31153846154,gasCCGT,5,MUS$2010/PJ,2050 A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.23076923077,solarPV,5,MUS$2010/PJ,2050 @@ -411,8 +411,8 @@ A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,pow A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050 A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.46153846154,solarPV,5,MUS$2010/PJ,2050 A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.36923076923,windturbine,5,MUS$2010/PJ,2050 -A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.51957692308,gasCCGT,5,MUS$2010/kt,2050 -A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.55873076923,gasCCGT,5,MUS$2010/kt,2050 +A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,1.58659615385,gasCCGT,5,MUS$2010/kt,2050 +A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,4.75978846154,gasCCGT,5,MUS$2010/kt,2050 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.34684615385,gassupply1,0,MUS$2010/PJ,2050 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.52026923077,gassupply1,1,MUS$2010/PJ,2050 A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.34684615385,gassupply1,2,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index e6b1be9bd..c81d6f990 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,4.08500000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,1.69400000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,3.23830000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.59010000000,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,4.08500000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,1.69400000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,3.23830000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.59010000000,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,4.08500000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,1.69400000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,3.23830000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.59010000000,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,4.08500000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,1.69400000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,3.23830000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.59010000000,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,4.08500000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,1.69400000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,3.23830000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.59010000000,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,4.08500000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,1.69400000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,3.23830000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.59010000000,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,6.00210000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,1.93590000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,2.64130000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.36960000000,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,6.00210000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,1.93590000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,2.64130000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.36960000000,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,6.00210000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,1.93590000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,2.64130000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.36960000000,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,6.00210000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,1.93590000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,2.64130000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.36960000000,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,6.00210000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,1.93590000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,2.64130000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.36960000000,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,6.00210000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,1.93590000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,2.64130000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.36960000000,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,6.30080000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,2.03280000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,2.76080000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.37600000000,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,6.30080000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,2.03280000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,2.76080000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.37600000000,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,6.30080000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,2.03280000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,2.76080000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.37600000000,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,6.30080000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,2.03280000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,2.76080000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.37600000000,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,6.30080000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,2.03280000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,2.76080000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.37600000000,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,6.30080000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,2.03280000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,2.76080000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.37600000000,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,6.86500000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,2.14690000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,2.98650000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.38360000000,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,6.86500000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,2.14690000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,2.98650000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.38360000000,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,6.86500000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,2.14690000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,2.98650000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.38360000000,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,6.86500000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,2.14690000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,2.98650000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.38360000000,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,6.86500000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,2.14690000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,2.98650000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.38360000000,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,6.86500000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,2.14690000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,2.98650000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.38360000000,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,7.46020000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,2.26720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,3.22460000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.39170000000,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.46020000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,2.26720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,3.22460000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.39170000000,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,7.46020000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,2.26720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,3.22460000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.39170000000,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.46020000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,2.26720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,3.22460000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.39170000000,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,7.46020000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,2.26720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.22460000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.39170000000,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,7.46020000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,2.26720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,3.22460000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.39170000000,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,8.30270000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,2.43570000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,3.56160000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.40290000000,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,8.30270000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,2.43570000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,3.56160000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.40290000000,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,8.30270000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,2.43570000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,3.56160000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.40290000000,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,8.30270000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,2.43570000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,3.56160000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.40290000000,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.30270000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,2.43570000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.56160000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.40290000000,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,8.30270000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,2.43570000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,3.56160000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.40290000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/user-guide/carbon-budget.ipynb b/docs/user-guide/carbon-budget.ipynb index ca5a33272..edae72c30 100644 --- a/docs/user-guide/carbon-budget.ipynb +++ b/docs/user-guide/carbon-budget.ipynb @@ -28,7 +28,7 @@ "\n", "```toml\n", "[carbon_budget_control]\n", - "budget = [300, 300, 300, 300]\n", + "budget = [50, 50, 50, 50]\n", "commodities = ['CO2f']\n", "control_undershoot = false\n", "control_overshoot = false\n", @@ -80,7 +80,7 @@ " .reset_index()\n", ")\n", "sns.barplot(data=df_sum[df_sum.commodity == \"CO2f\"], x=\"year\", y=\"supply\", ax=ax1)\n", - "carbon_profile = [300, 300, 300, 300]\n", + "carbon_profile = [50, 50, 50, 50]\n", "ax1.plot(carbon_profile, c=\"r\", label=\"Carbon budget\")\n", "ax1.legend()\n", "ax1.set_ylabel(\"CO2 emissions\")\n", diff --git a/src/muse/costs.py b/src/muse/costs.py index 10ef893d4..a28af3ceb 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -389,19 +389,38 @@ def annual_levelized_cost_of_energy( / techs.utilization_factor ) - fuel_costs = (techs.fixed_inputs * prices).sum("commodity") + fuel_costs = ( + convert_timeslice(techs.fixed_inputs, prices.timeslice, QuantityType.EXTENSIVE) + * prices + ).sum("commodity") + + fuel_costs += ( + convert_timeslice( + techs.flexible_inputs, prices.timeslice, QuantityType.EXTENSIVE + ) + * prices + ).sum("commodity") - fuel_costs += (techs.flexible_inputs * prices).sum("commodity") if "region" in techs.dims: env_costs = ( - (techs.fixed_outputs * prices) + ( + convert_timeslice( + techs.fixed_outputs, prices.timeslice, QuantityType.EXTENSIVE + ) + * prices + ) .sel(region=techs.region) .sel(commodity=is_pollutant(techs.comm_usage)) .sum("commodity") ) else: env_costs = ( - (techs.fixed_outputs * prices) + ( + convert_timeslice( + techs.fixed_outputs, prices.timeslice, QuantityType.EXTENSIVE + ) + * prices + ) .sel(commodity=is_pollutant(techs.comm_usage)) .sum("commodity") ) diff --git a/src/muse/objectives.py b/src/muse/objectives.py index 13189183f..2bb3b7ba4 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -322,12 +322,18 @@ def emission_cost( with :math:`s` the timeslices and :math:`c` the commodity. """ from muse.commodities import is_enduse, is_pollutant + from muse.timeslices import QuantityType, convert_timeslice enduses = is_enduse(technologies.comm_usage.sel(commodity=demand.commodity)) total = demand.sel(commodity=enduses).sum("commodity") envs = is_pollutant(technologies.comm_usage) prices = filter_input(prices, year=demand.year.item(), commodity=envs) - return total * (technologies.fixed_outputs * prices).sum("commodity") + return total * ( + convert_timeslice( + technologies.fixed_outputs, prices.timeslice, QuantityType.EXTENSIVE + ) + * prices + ).sum("commodity") @register_objective diff --git a/src/muse/quantities.py b/src/muse/quantities.py index bc4dd27a0..64331943d 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -125,6 +125,7 @@ def emission(production: xr.DataArray, fixed_outputs: xr.DataArray): A data array containing emissions (and only emissions). """ from muse.commodities import is_enduse, is_pollutant + from muse.timeslices import QuantityType, convert_timeslice from muse.utilities import broadcast_techs # just in case we are passed a technologies dataset, like in other functions @@ -133,8 +134,8 @@ def emission(production: xr.DataArray, fixed_outputs: xr.DataArray): ) envs = is_pollutant(fouts.comm_usage) enduses = is_enduse(fouts.comm_usage) - return production.sel(commodity=enduses).sum("commodity") * fouts.sel( - commodity=envs + return production.sel(commodity=enduses).sum("commodity") * convert_timeslice( + fouts.sel(commodity=envs), production.timeslice, QuantityType.EXTENSIVE ) @@ -198,9 +199,14 @@ def gross_margin( # The individual prices are selected # costs due to consumables, direct inputs - consumption_costs = (prices * fixed_inputs).sum("commodity") + consumption_costs = ( + prices + * convert_timeslice(fixed_inputs, prices.timeslice, QuantityType.EXTENSIVE) + ).sum("commodity") # costs due to pollutants - production_costs = prices * fixed_outputs + production_costs = prices * convert_timeslice( + fixed_outputs, prices.timeslice, QuantityType.EXTENSIVE + ) environmental_costs = (production_costs.sel(commodity=environmentals)).sum( "commodity" ) diff --git a/tests/example_outputs/default/MCAPrices.csv b/tests/example_outputs/default/MCAPrices.csv index 054bc9742..c1ea29d40 100644 --- a/tests/example_outputs/default/MCAPrices.csv +++ b/tests/example_outputs/default/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,9.39110000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.21830000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.91850000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.61770000000,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.39110000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.21830000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.91850000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.61770000000,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,9.39110000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.21830000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.91850000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.61770000000,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.39110000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.21830000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.91850000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.61770000000,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.39110000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.21830000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.91850000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.61770000000,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,9.39110000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.21830000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.91850000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.61770000000,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,13.09720000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.74670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.47940000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.42360000000,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,13.09720000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.74670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.47940000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.42360000000,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,13.09720000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.74670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.47940000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.42360000000,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,13.09720000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.74670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.47940000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.42360000000,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.09720000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.74670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.47940000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.42360000000,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.09720000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.74670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.47940000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.42360000000,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,13.88410000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,3.06380000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,5.79410000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.44480000000,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,13.88410000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,3.06380000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.79410000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.44480000000,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,13.88410000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,3.06380000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,5.79410000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.44480000000,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,13.88410000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,3.06380000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.79410000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.44480000000,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,13.88410000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,3.06380000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.79410000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.44480000000,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.88410000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,3.06380000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,5.79410000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.44480000000,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,14.99440000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,3.34130000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.23820000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.46330000000,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,14.99440000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,3.34130000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.23820000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.46330000000,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,14.99440000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,3.34130000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.23820000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.46330000000,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,14.99440000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,3.34130000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.23820000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.46330000000,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,14.99440000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,3.34130000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.23820000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.46330000000,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.99440000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,3.34130000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.23820000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.46330000000,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,16.83640000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.71730000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,6.97510000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.48830000000,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.83640000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.71730000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,6.97510000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.48830000000,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,16.83640000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.71730000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,6.97510000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.48830000000,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.83640000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.71730000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,6.97510000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.48830000000,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,16.83640000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.71730000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,6.97510000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.48830000000,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.83640000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.71730000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,6.97510000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.48830000000,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,18.26530000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,4.00900000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.54660000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.50780000000,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.26530000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,4.00900000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.54660000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.50780000000,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,18.26530000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,4.00900000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.54660000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.50780000000,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.26530000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,4.00900000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.54660000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.50780000000,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,18.26530000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,4.00900000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,7.54660000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.50780000000,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,18.26530000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,4.00900000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.54660000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.50780000000,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/MCAPrices.csv b/tests/example_outputs/default_retro/MCAPrices.csv index ca7378aff..a88c27229 100644 --- a/tests/example_outputs/default_retro/MCAPrices.csv +++ b/tests/example_outputs/default_retro/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,9.18790000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.20370000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.85420000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.61700000000,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.18790000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.20370000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.85420000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.61700000000,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,9.18790000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.20370000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.85420000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.61700000000,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.18790000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.20370000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.85420000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.61700000000,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.18790000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.20370000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.85420000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.61700000000,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,9.18790000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.20370000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.85420000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.61700000000,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,13.07600000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.74470000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.47090000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.42350000000,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,13.07600000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.74470000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.47090000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.42350000000,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,13.07600000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.74470000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.47090000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.42350000000,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,13.07600000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.74470000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.47090000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.42350000000,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.07600000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.74470000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.47090000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.42350000000,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.07600000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.74470000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.47090000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.42350000000,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,14.78530000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,3.16690000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.15460000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.45160000000,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,14.78530000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,3.16690000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.15460000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.45160000000,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,14.78530000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,3.16690000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,6.15460000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.45160000000,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,14.78530000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,3.16690000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.15460000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.45160000000,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,14.78530000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,3.16690000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.15460000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.45160000000,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.78530000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,3.16690000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.15460000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.45160000000,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,16.00630000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,3.46840000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.64300000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.47170000000,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.00630000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,3.46840000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.64300000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.47170000000,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,16.00630000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,3.46840000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.64300000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.47170000000,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.00630000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,3.46840000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.64300000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.47170000000,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,16.00630000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,3.46840000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.64300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.47170000000,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,16.00630000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,3.46840000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.64300000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.47170000000,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,18.01280000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.87630000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.44560000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.49890000000,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,18.01280000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.87630000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.44560000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.49890000000,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,18.01280000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.87630000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.44560000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.49890000000,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,18.01280000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.87630000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.44560000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.49890000000,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,18.01280000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.87630000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.44560000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.49890000000,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,18.01280000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.87630000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.44560000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.49890000000,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,19.57340000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,4.19360000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.06980000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.52010000000,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.57340000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,4.19360000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.06980000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.52010000000,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,19.57340000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,4.19360000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.06980000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.52010000000,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.57340000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,4.19360000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.06980000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.52010000000,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,19.57340000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,4.19360000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.06980000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.52010000000,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,19.57340000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,4.19360000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.06980000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.52010000000,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/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv index ee2ed867b..96be5b043 100644 --- a/tests/example_outputs/default_timeslice/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/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,2.31520000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,0.91100000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,3.25460000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.56480000000,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,2.31520000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,0.91100000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,3.25460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.56480000000,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,2.31520000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,0.91100000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,3.25460000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.56480000000,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,2.31520000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,0.91100000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,3.25460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.56480000000,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,2.31520000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,0.91100000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,3.25460000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.56480000000,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,2.31520000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,0.91100000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,3.25460000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.56480000000,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,0.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.28490000000,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,0.66670000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.28490000000,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,0.66670000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.28490000000,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,0.66670000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.28490000000,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,0.66670000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.28490000000,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,0.66670000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.28490000000,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,0.66670000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.28490000000,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/Power_Supply.csv b/tests/example_outputs/default_timeslice/Power_Supply.csv index 628fcd016..2dff67850 100644 --- a/tests/example_outputs/default_timeslice/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Power_Supply.csv @@ -1,22 +1,22 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year 0,10,electricity,all-week,night,2020,all-year,R1,0.06030000000,gasCCGT,0,MUS$2010/PJ,2025 1,10,electricity,all-week,night,2020,all-year,R1,0.36190000000,windturbine,0,MUS$2010/PJ,2025 -0,6,CO2f,all-week,night,2020,all-year,R1,5.52930000000,gasCCGT,0,MUS$2010/kt,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,0.92160000000,gasCCGT,0,MUS$2010/kt,2025 0,10,electricity,all-week,morning,2020,all-year,R1,0.09050000000,gasCCGT,1,MUS$2010/PJ,2025 1,10,electricity,all-week,morning,2020,all-year,R1,0.54290000000,windturbine,1,MUS$2010/PJ,2025 -0,6,CO2f,all-week,morning,2020,all-year,R1,8.29400000000,gasCCGT,1,MUS$2010/kt,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,1.38230000000,gasCCGT,1,MUS$2010/kt,2025 0,10,electricity,all-week,afternoon,2020,all-year,R1,0.06030000000,gasCCGT,2,MUS$2010/PJ,2025 1,10,electricity,all-week,afternoon,2020,all-year,R1,0.36190000000,windturbine,2,MUS$2010/PJ,2025 -0,6,CO2f,all-week,afternoon,2020,all-year,R1,5.52930000000,gasCCGT,2,MUS$2010/kt,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,0.92160000000,gasCCGT,2,MUS$2010/kt,2025 0,10,electricity,all-week,early-peak,2020,all-year,R1,0.09050000000,gasCCGT,3,MUS$2010/PJ,2025 1,10,electricity,all-week,early-peak,2020,all-year,R1,0.54290000000,windturbine,3,MUS$2010/PJ,2025 -0,6,CO2f,all-week,early-peak,2020,all-year,R1,8.29400000000,gasCCGT,3,MUS$2010/kt,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,1.38230000000,gasCCGT,3,MUS$2010/kt,2025 0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025 1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2025 -0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025 +0,6,CO2f,all-week,late-peak,2020,all-year,R1,2.54640000000,gasCCGT,4,MUS$2010/kt,2025 0,10,electricity,all-week,evening,2020,all-year,R1,0.12060000000,gasCCGT,5,MUS$2010/PJ,2025 1,10,electricity,all-week,evening,2020,all-year,R1,0.72380000000,windturbine,5,MUS$2010/PJ,2025 -0,6,CO2f,all-week,evening,2020,all-year,R1,11.05860000000,gasCCGT,5,MUS$2010/kt,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,1.84310000000,gasCCGT,5,MUS$2010/kt,2025 1,10,electricity,all-week,night,2020,all-year,R1,0.36360000000,windturbine,0,MUS$2010/PJ,2030 2,10,electricity,all-week,night,2025,all-year,R1,0.30300000000,windturbine,0,MUS$2010/PJ,2030 1,10,electricity,all-week,morning,2020,all-year,R1,0.54550000000,windturbine,1,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/medium/MCAPrices.csv b/tests/example_outputs/medium/MCAPrices.csv index f2a44ba2a..962d57bbb 100644 --- a/tests/example_outputs/medium/MCAPrices.csv +++ b/tests/example_outputs/medium/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,12.25210000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.42260000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,7.32800000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,1.12700000000,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,0.71270000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,12.25210000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.42260000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,7.32800000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,1.12700000000,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,0.71270000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,12.25210000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.42260000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,7.32800000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,1.12700000000,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,0.71270000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,12.25210000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.42260000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,7.32800000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,1.12700000000,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,0.71270000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,12.25210000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.42260000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.32800000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,1.12700000000,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,0.71270000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,12.25210000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.42260000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,7.32800000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,1.12700000000,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,0.71270000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,15.63730000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.98680000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.50930000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,1.11540000000,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,0.71270000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,15.63730000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.98680000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,8.50930000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,1.11540000000,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,0.71270000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,15.63730000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.98680000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.50930000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,1.11540000000,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,0.71270000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,15.63730000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.98680000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,8.50930000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,1.11540000000,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,0.71270000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,15.63730000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.98680000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,8.50930000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,1.11540000000,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,0.71270000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,15.63730000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.98680000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,8.50930000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,1.11540000000,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,0.71270000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,13.77050000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,3.05080000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.17380000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,1.24810000000,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,0.71270000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,13.77050000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,3.05080000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.17380000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,1.24810000000,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,0.71270000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,13.77050000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,3.05080000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.17380000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,1.24810000000,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,0.71270000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,13.77050000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,3.05080000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.17380000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,1.24810000000,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,0.71270000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,13.77050000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,3.05080000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.17380000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,1.24810000000,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,0.71270000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,13.77050000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,3.05080000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.17380000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,1.24810000000,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,0.71270000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,9.66330000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,2.67140000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,4.10580000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.41860000000,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,0.71270000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,9.66330000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,2.67140000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,4.10580000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.41860000000,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,0.71270000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,9.66330000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,2.67140000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,4.10580000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.41860000000,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,0.71270000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,9.66330000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,2.67140000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,4.10580000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.41860000000,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,0.71270000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,9.66330000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,2.67140000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,4.10580000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.41860000000,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,0.71270000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,9.66330000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,2.67140000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.10580000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.41860000000,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,0.71270000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,10.76850000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,2.89700000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,4.54790000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.43360000000,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,0.71270000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,10.76850000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,2.89700000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,4.54790000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.43360000000,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,0.71270000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,10.76850000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,2.89700000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,4.54790000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.43360000000,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,0.71270000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,10.76850000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,2.89700000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,4.54790000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.43360000000,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,0.71270000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,10.76850000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,2.89700000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,4.54790000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.43360000000,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,0.71270000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,10.76850000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,2.89700000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.54790000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.43360000000,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,0.71270000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,11.62580000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.07210000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,4.89080000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.44530000000,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,0.71270000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,11.62580000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,3.07210000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,4.89080000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.44530000000,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,0.71270000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,11.62580000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,3.07210000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,4.89080000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.44530000000,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,0.71270000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,11.62580000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,3.07210000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,4.89080000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.44530000000,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,0.71270000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,11.62580000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,3.07210000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,4.89080000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.44530000000,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,0.71270000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,11.62580000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,3.07210000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.89080000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.44530000000,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,0.71270000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/MCAPrices.csv b/tests/example_outputs/minimum_service/MCAPrices.csv index a1914ef93..8479d9199 100644 --- a/tests/example_outputs/minimum_service/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/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,384.08350000000,R1,0,MUS$2010/Mt,2015 +ammonia,all-week,all-day,winter,131.19350000000,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,384.08350000000,R1,1,MUS$2010/Mt,2015 +ammonia,all-week,all-day,summer,131.19350000000,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,384.08350000000,R1,2,MUS$2010/Mt,2015 +ammonia,all-week,all-day,spring-autumn,131.19350000000,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,406.89500000000,R1,0,MUS$2010/Mt,2020 +ammonia,all-week,all-day,winter,138.80370000000,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,406.89500000000,R1,1,MUS$2010/Mt,2020 +ammonia,all-week,all-day,summer,138.80370000000,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,406.89500000000,R1,2,MUS$2010/Mt,2020 +ammonia,all-week,all-day,spring-autumn,138.80370000000,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,461.98460000000,R1,0,MUS$2010/Mt,2025 +ammonia,all-week,all-day,winter,157.17330000000,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,461.98460000000,R1,1,MUS$2010/Mt,2025 +ammonia,all-week,all-day,summer,157.17330000000,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,461.98460000000,R1,2,MUS$2010/Mt,2025 +ammonia,all-week,all-day,spring-autumn,157.17330000000,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,516.55490000000,R1,0,MUS$2010/Mt,2030 +ammonia,all-week,all-day,winter,175.36980000000,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,516.55490000000,R1,1,MUS$2010/Mt,2030 +ammonia,all-week,all-day,summer,175.36980000000,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,516.55490000000,R1,2,MUS$2010/Mt,2030 +ammonia,all-week,all-day,spring-autumn,175.36980000000,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,485.53360000000,R1,0,MUS$2010/Mt,2035 +ammonia,all-week,all-day,winter,165.03960000000,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,485.53360000000,R1,1,MUS$2010/Mt,2035 +ammonia,all-week,all-day,summer,165.03960000000,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,485.53360000000,R1,2,MUS$2010/Mt,2035 +ammonia,all-week,all-day,spring-autumn,165.03960000000,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,454.09650000000,R1,0,MUS$2010/Mt,2040 +ammonia,all-week,all-day,winter,154.56700000000,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,454.09650000000,R1,1,MUS$2010/Mt,2040 +ammonia,all-week,all-day,summer,154.56700000000,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,454.09650000000,R1,2,MUS$2010/Mt,2040 +ammonia,all-week,all-day,spring-autumn,154.56700000000,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,451.89580000000,R1,0,MUS$2010/Mt,2045 +ammonia,all-week,all-day,winter,153.83350000000,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,451.89580000000,R1,1,MUS$2010/Mt,2045 +ammonia,all-week,all-day,summer,153.83350000000,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,451.89580000000,R1,2,MUS$2010/Mt,2045 +ammonia,all-week,all-day,spring-autumn,153.83350000000,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,449.67040000000,R1,0,MUS$2010/Mt,2050 +ammonia,all-week,all-day,winter,153.09170000000,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,449.67040000000,R1,1,MUS$2010/Mt,2050 +ammonia,all-week,all-day,summer,153.09170000000,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,449.67040000000,R1,2,MUS$2010/Mt,2050 +ammonia,all-week,all-day,spring-autumn,153.09170000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/minimum_service/MCASupply.csv b/tests/example_outputs/minimum_service/MCASupply.csv index 504d560dd..c562c6718 100644 --- a/tests/example_outputs/minimum_service/MCASupply.csv +++ b/tests/example_outputs/minimum_service/MCASupply.csv @@ -1,55 +1,55 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year ammonia,all-week,all-day,winter,R1,14.73330000000,0,MUS$2010/Mt,2010 -CO2f,all-week,all-day,winter,R1,53628.56500000000,0,MUS$2010/kt,2010 +CO2f,all-week,all-day,winter,R1,17876.18830000000,0,MUS$2010/kt,2010 ammonia,all-week,all-day,summer,R1,14.73330000000,1,MUS$2010/Mt,2010 -CO2f,all-week,all-day,summer,R1,53628.56500000000,1,MUS$2010/kt,2010 +CO2f,all-week,all-day,summer,R1,17876.18830000000,1,MUS$2010/kt,2010 ammonia,all-week,all-day,spring-autumn,R1,14.73330000000,2,MUS$2010/Mt,2010 -CO2f,all-week,all-day,spring-autumn,R1,53628.56500000000,2,MUS$2010/kt,2010 +CO2f,all-week,all-day,spring-autumn,R1,17876.18830000000,2,MUS$2010/kt,2010 ammonia,all-week,all-day,winter,R1,14.92000000000,0,MUS$2010/Mt,2015 -CO2f,all-week,all-day,winter,R1,55113.51750000000,0,MUS$2010/kt,2015 +CO2f,all-week,all-day,winter,R1,18371.17250000000,0,MUS$2010/kt,2015 ammonia,all-week,all-day,summer,R1,15.37220000000,1,MUS$2010/Mt,2015 -CO2f,all-week,all-day,summer,R1,56783.62400000000,1,MUS$2010/kt,2015 +CO2f,all-week,all-day,summer,R1,18927.87470000000,1,MUS$2010/kt,2015 ammonia,all-week,all-day,spring-autumn,R1,14.92000000000,2,MUS$2010/Mt,2015 -CO2f,all-week,all-day,spring-autumn,R1,55113.51750000000,2,MUS$2010/kt,2015 +CO2f,all-week,all-day,spring-autumn,R1,18371.17250000000,2,MUS$2010/kt,2015 ammonia,all-week,all-day,winter,R1,14.92000000000,0,MUS$2010/Mt,2020 -CO2f,all-week,all-day,winter,R1,56295.53450000000,0,MUS$2010/kt,2020 +CO2f,all-week,all-day,winter,R1,18765.17820000000,0,MUS$2010/kt,2020 ammonia,all-week,all-day,summer,R1,15.37220000000,1,MUS$2010/Mt,2020 -CO2f,all-week,all-day,summer,R1,58001.45970000000,1,MUS$2010/kt,2020 +CO2f,all-week,all-day,summer,R1,19333.81990000000,1,MUS$2010/kt,2020 ammonia,all-week,all-day,spring-autumn,R1,14.92000000000,2,MUS$2010/Mt,2020 -CO2f,all-week,all-day,spring-autumn,R1,56295.53450000000,2,MUS$2010/kt,2020 +CO2f,all-week,all-day,spring-autumn,R1,18765.17820000000,2,MUS$2010/kt,2020 ammonia,all-week,all-day,winter,R1,14.93090000000,0,MUS$2010/Mt,2025 -CO2f,all-week,all-day,winter,R1,57445.60100000000,0,MUS$2010/kt,2025 +CO2f,all-week,all-day,winter,R1,19148.53370000000,0,MUS$2010/kt,2025 ammonia,all-week,all-day,summer,R1,15.38340000000,1,MUS$2010/Mt,2025 -CO2f,all-week,all-day,summer,R1,59186.37670000000,1,MUS$2010/kt,2025 +CO2f,all-week,all-day,summer,R1,19728.79220000000,1,MUS$2010/kt,2025 ammonia,all-week,all-day,spring-autumn,R1,14.93090000000,2,MUS$2010/Mt,2025 -CO2f,all-week,all-day,spring-autumn,R1,57445.60100000000,2,MUS$2010/kt,2025 +CO2f,all-week,all-day,spring-autumn,R1,19148.53370000000,2,MUS$2010/kt,2025 ammonia,all-week,all-day,winter,R1,14.94180000000,0,MUS$2010/Mt,2030 -CO2f,all-week,all-day,winter,R1,58518.66690000000,0,MUS$2010/kt,2030 +CO2f,all-week,all-day,winter,R1,19506.22230000000,0,MUS$2010/kt,2030 ammonia,all-week,all-day,summer,R1,15.39460000000,1,MUS$2010/Mt,2030 -CO2f,all-week,all-day,summer,R1,60291.95980000000,1,MUS$2010/kt,2030 +CO2f,all-week,all-day,summer,R1,20097.31990000000,1,MUS$2010/kt,2030 ammonia,all-week,all-day,spring-autumn,R1,14.94180000000,2,MUS$2010/Mt,2030 -CO2f,all-week,all-day,spring-autumn,R1,58518.66690000000,2,MUS$2010/kt,2030 +CO2f,all-week,all-day,spring-autumn,R1,19506.22230000000,2,MUS$2010/kt,2030 ammonia,all-week,all-day,winter,R1,14.72400000000,0,MUS$2010/Mt,2035 -CO2f,all-week,all-day,winter,R1,58985.15200000000,0,MUS$2010/kt,2035 +CO2f,all-week,all-day,winter,R1,19661.71730000000,0,MUS$2010/kt,2035 ammonia,all-week,all-day,summer,R1,15.17020000000,1,MUS$2010/Mt,2035 -CO2f,all-week,all-day,summer,R1,60772.58080000000,1,MUS$2010/kt,2035 +CO2f,all-week,all-day,summer,R1,20257.52690000000,1,MUS$2010/kt,2035 ammonia,all-week,all-day,spring-autumn,R1,14.72400000000,2,MUS$2010/Mt,2035 -CO2f,all-week,all-day,spring-autumn,R1,58985.15200000000,2,MUS$2010/kt,2035 +CO2f,all-week,all-day,spring-autumn,R1,19661.71730000000,2,MUS$2010/kt,2035 ammonia,all-week,all-day,winter,R1,14.50610000000,0,MUS$2010/Mt,2040 -CO2f,all-week,all-day,winter,R1,58680.98930000000,0,MUS$2010/kt,2040 +CO2f,all-week,all-day,winter,R1,19560.32980000000,0,MUS$2010/kt,2040 ammonia,all-week,all-day,summer,R1,14.94570000000,1,MUS$2010/Mt,2040 -CO2f,all-week,all-day,summer,R1,60459.20110000000,1,MUS$2010/kt,2040 +CO2f,all-week,all-day,summer,R1,20153.06700000000,1,MUS$2010/kt,2040 ammonia,all-week,all-day,spring-autumn,R1,14.50610000000,2,MUS$2010/Mt,2040 -CO2f,all-week,all-day,spring-autumn,R1,58680.98930000000,2,MUS$2010/kt,2040 +CO2f,all-week,all-day,spring-autumn,R1,19560.32980000000,2,MUS$2010/kt,2040 ammonia,all-week,all-day,winter,R1,14.09730000000,0,MUS$2010/Mt,2045 -CO2f,all-week,all-day,winter,R1,56747.97620000000,0,MUS$2010/kt,2045 +CO2f,all-week,all-day,winter,R1,18915.99210000000,0,MUS$2010/kt,2045 ammonia,all-week,all-day,summer,R1,14.52450000000,1,MUS$2010/Mt,2045 -CO2f,all-week,all-day,summer,R1,58467.61180000000,1,MUS$2010/kt,2045 +CO2f,all-week,all-day,summer,R1,19489.20390000000,1,MUS$2010/kt,2045 ammonia,all-week,all-day,spring-autumn,R1,14.09730000000,2,MUS$2010/Mt,2045 -CO2f,all-week,all-day,spring-autumn,R1,56747.97620000000,2,MUS$2010/kt,2045 +CO2f,all-week,all-day,spring-autumn,R1,18915.99210000000,2,MUS$2010/kt,2045 ammonia,all-week,all-day,winter,R1,13.68850000000,0,MUS$2010/Mt,2050 -CO2f,all-week,all-day,winter,R1,54828.11040000000,0,MUS$2010/kt,2050 +CO2f,all-week,all-day,winter,R1,18276.03680000000,0,MUS$2010/kt,2050 ammonia,all-week,all-day,summer,R1,14.10330000000,1,MUS$2010/Mt,2050 -CO2f,all-week,all-day,summer,R1,56489.56820000000,1,MUS$2010/kt,2050 +CO2f,all-week,all-day,summer,R1,18829.85610000000,1,MUS$2010/kt,2050 ammonia,all-week,all-day,spring-autumn,R1,13.68850000000,2,MUS$2010/Mt,2050 -CO2f,all-week,all-day,spring-autumn,R1,54828.11040000000,2,MUS$2010/kt,2050 +CO2f,all-week,all-day,spring-autumn,R1,18276.03680000000,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/multiple_agents/MCAPrices.csv b/tests/example_outputs/multiple_agents/MCAPrices.csv index 20946c704..c1f4c150e 100644 --- a/tests/example_outputs/multiple_agents/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/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,9.39110000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,2.21830000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,4.91850000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.61770000000,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.39110000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,2.21830000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,4.91850000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.61770000000,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,9.39110000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,2.21830000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,4.91850000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.61770000000,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.39110000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,2.21830000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,4.91850000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.61770000000,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.39110000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,2.21830000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,4.91850000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.61770000000,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,9.39110000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,2.21830000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,4.91850000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.61770000000,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,13.28930000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,2.76490000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,5.55620000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.42480000000,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,13.28930000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,2.76490000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.55620000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.42480000000,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,13.28930000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,2.76490000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,5.55620000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.42480000000,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,13.28930000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,2.76490000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.55620000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.42480000000,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.28930000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,2.76490000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.55620000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.42480000000,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.28930000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,2.76490000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.55620000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.42480000000,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,15.01190000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,3.19280000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,6.24530000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.45340000000,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,15.01190000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,3.19280000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,6.24530000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.45340000000,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,15.01190000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,3.19280000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,6.24530000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.45340000000,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,15.01190000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,3.19280000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,6.24530000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.45340000000,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,15.01190000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,3.19280000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.24530000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.45340000000,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.01190000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,3.19280000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.24530000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.45340000000,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,16.23940000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,3.49770000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.73620000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,0.47370000000,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.23940000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,3.49770000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,6.73620000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,0.47370000000,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,16.23940000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,3.49770000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.73620000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,0.47370000000,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.23940000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,3.49770000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,6.73620000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,0.47370000000,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,16.23940000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,3.49770000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.73620000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,0.47370000000,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,16.23940000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,3.49770000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,6.73620000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,0.47370000000,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,18.26600000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,3.91060000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.54690000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,0.50120000000,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,18.26600000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,3.91060000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.54690000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,0.50120000000,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,18.26600000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,3.91060000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.54690000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,0.50120000000,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,18.26600000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,3.91060000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.54690000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,0.50120000000,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,18.26600000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,3.91060000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,7.54690000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,0.50120000000,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,18.26600000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,3.91060000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.54690000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,0.50120000000,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,19.84020000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,4.23130000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.17660000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,0.52260000000,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.84020000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,4.23130000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.17660000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,0.52260000000,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,19.84020000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,4.23130000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.17660000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,0.52260000000,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.84020000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,4.23130000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.17660000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,0.52260000000,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,19.84020000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,4.23130000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.17660000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,0.52260000000,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,19.84020000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,4.23130000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.17660000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,0.52260000000,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/MCAPrices.csv b/tests/example_outputs/trade/MCAPrices.csv index 821f77cec..a9ef8e426 100644 --- a/tests/example_outputs/trade/MCAPrices.csv +++ b/tests/example_outputs/trade/MCAPrices.csv @@ -25,109 +25,109 @@ 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,19.56940000000,R1,0,MUS$2010/PJ,2025 electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,5.82810000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,5.92540000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,6.50530000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,7.85960000000,R2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.29980000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.37690000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.78380000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,0.93720000000,R2,0,MUS$2010/PJ,2025 electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2025 electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,5.82810000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,5.92540000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,6.50530000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,7.85960000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.29980000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.37690000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.78380000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,0.93720000000,R2,1,MUS$2010/PJ,2025 electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2025 electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,5.82810000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,5.92540000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,6.50530000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,7.85960000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.29980000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.37690000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.78380000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,0.93720000000,R2,2,MUS$2010/PJ,2025 electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2025 electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,5.82810000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,5.92540000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,6.50530000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,7.85960000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.29980000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.37690000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.78380000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,0.93720000000,R2,3,MUS$2010/PJ,2025 electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2025 electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,5.82810000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,5.92540000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.50530000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.85960000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.29980000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.37690000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.78380000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,0.93720000000,R2,4,MUS$2010/PJ,2025 electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2025 electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,5.82810000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,5.92540000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.50530000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,7.85960000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.29980000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.37690000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.78380000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,0.93720000000,R2,5,MUS$2010/PJ,2025 electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2030 electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,6.52970000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,6.72430000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,7.32100000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.97430000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,1.33800000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,1.44120000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.46420000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,0.56420000000,R2,0,MUS$2010/PJ,2030 electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2030 electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,6.52970000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,6.72430000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,7.32100000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,8.97430000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,1.33800000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,1.44120000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.46420000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,0.56420000000,R2,1,MUS$2010/PJ,2030 electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2030 electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,6.52970000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,6.72430000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,7.32100000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.97430000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,1.33800000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,1.44120000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.46420000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,0.56420000000,R2,2,MUS$2010/PJ,2030 electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2030 electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,6.52970000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,6.72430000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,7.32100000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,8.97430000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,1.33800000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,1.44120000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.46420000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,0.56420000000,R2,3,MUS$2010/PJ,2030 electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2030 electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,6.52970000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,6.72430000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,7.32100000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,8.97430000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,1.33800000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,1.44120000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.46420000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,0.56420000000,R2,4,MUS$2010/PJ,2030 electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2030 electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,6.52970000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,6.72430000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,7.32100000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,8.97430000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,1.33800000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,1.44120000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.46420000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,0.56420000000,R2,5,MUS$2010/PJ,2030 electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2035 electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,7.23120000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,7.52310000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.13670000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,10.08890000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,1.01070000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,1.12280000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.35550000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,0.43730000000,R2,0,MUS$2010/PJ,2035 electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2035 electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,7.23120000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,7.52310000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,8.13670000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.08890000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,1.01070000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,1.12280000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.35550000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,0.43730000000,R2,1,MUS$2010/PJ,2035 electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2035 electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,7.23120000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,7.52310000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.13670000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,10.08890000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,1.01070000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,1.12280000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.35550000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,0.43730000000,R2,2,MUS$2010/PJ,2035 electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2035 electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,7.23120000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,7.52310000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,8.13670000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.08890000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,1.01070000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,1.12280000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.35550000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,0.43730000000,R2,3,MUS$2010/PJ,2035 electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2035 electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,7.23120000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,7.52310000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.13670000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,10.08890000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,1.01070000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,1.12280000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.35550000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,0.43730000000,R2,4,MUS$2010/PJ,2035 electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2035 electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,7.23120000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,7.52310000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.13670000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.08890000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,1.01070000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,1.12280000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.35550000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,0.43730000000,R2,5,MUS$2010/PJ,2035 diff --git a/tests/test_quantities.py b/tests/test_quantities.py index 0538ff861..d2c401a7f 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -91,7 +91,6 @@ def test_supply_emissions(technologies, capacity): def test_gross_margin(technologies, capacity, market, timeslice): from muse.commodities import is_enduse, is_fuel, is_pollutant from muse.quantities import gross_margin - from muse.timeslices import QuantityType, convert_timeslice """ Gross margin refers to the calculation @@ -121,9 +120,7 @@ def test_gross_margin(technologies, capacity, market, timeslice): revenues = prices * prod * sum(is_enduse(usage)) env_costs = env_prices * envs * sum(is_pollutant(usage)) cons_costs = prices * fuels * sum(is_fuel(usage)) - var_costs = convert_timeslice( - vp * ((prod * sum(is_enduse(usage))) ** ve), timeslice, QuantityType.EXTENSIVE - ) + var_costs = vp * ((prod * sum(is_enduse(usage))) ** ve) expected = revenues - env_costs - cons_costs - var_costs expected *= 100 / revenues @@ -396,7 +393,7 @@ def test_emission(production: xr.DataArray, technologies: xr.Dataset): em = emission(production, technologies) assert em.commodity.isin(envs.commodity).all() - assert em.values == approx(fout * enduses.sum().values * prod) + assert (em.sum("timeslice") == approx(fout * enduses.sum().values * prod)).all() def test_demand_matched_production(