diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 626f22110..0c2b73d2f 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv @@ -3,37 +3,48 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 +A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,5.66060000000,R1,2030,R1,residential,heatpump,newcapa,2030 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,12.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 -A1,12.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,12.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,12.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,7.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,1.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,5.66060000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,12.35690000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A1,12.35690000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,6.15260000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,6.15260000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2045 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index c8b006471..f806474f7 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,19.37150000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,20.19960000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.73650000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.02330000000,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,19.37150000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,20.19960000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.73650000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.02330000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.37150000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,20.19960000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.73650000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.02330000000,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,19.37150000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,20.19960000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.73650000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.02330000000,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,19.37150000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,20.19960000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.73650000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.02330000000,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,19.37150000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.19960000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.73650000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.02330000000,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,19.85650000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.06740000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,10.48640000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.02560000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.85650000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.06740000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,10.48640000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.02560000000,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,19.85650000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.06740000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,10.48640000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.02560000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.85650000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.06740000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,10.48640000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.02560000000,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,19.85650000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.06740000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.48640000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.02560000000,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,19.85650000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.06740000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,10.48640000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.02560000000,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,22.01050000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,23.81450000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.40110000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.12440000000,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,22.01050000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,23.81450000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.40110000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.12440000000,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,22.01050000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,23.81450000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.40110000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.12440000000,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,22.01050000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,23.81450000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.40110000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.12440000000,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,22.01050000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.81450000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.40110000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.12440000000,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,22.01050000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,23.81450000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.40110000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.12440000000,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.78520000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,26.41580000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.06220000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,13.16500000000,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.78520000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,26.41580000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.06220000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,13.16500000000,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.78520000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,26.41580000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,12.06220000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,13.16500000000,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.78520000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,26.41580000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.06220000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,13.16500000000,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.78520000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,26.41580000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.06220000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.16500000000,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.78520000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,26.41580000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.06220000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,13.16500000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,26.46380000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,30.07470000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,13.10320000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,14.62850000000,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,26.46380000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,30.07470000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,13.10320000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,14.62850000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,26.46380000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,30.07470000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,13.10320000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,14.62850000000,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,26.46380000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,30.07470000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,13.10320000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,14.62850000000,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,26.46380000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,30.07470000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,13.10320000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.62850000000,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,26.46380000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,13.10320000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.00280000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.18620000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.04400000000,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,29.00280000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,14.18620000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.00280000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.18620000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.04400000000,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,29.00280000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,14.18620000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,16.04400000000,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,29.00280000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.18620000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.04400000000,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,29.00280000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,14.18620000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.04400000000,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/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index 6f7d24f9d..d0767bf6a 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv @@ -5,35 +5,35 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,16.00000000000,R1,2025,R1,power,solarPV,newcapa,2025 +A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,16.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 -A1,14.00000000000,R1,2030,R1,power,solarPV,newcapa,2030 +A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,16.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 -A1,14.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2035 +A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,16.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 -A1,14.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 +A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,16.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 -A1,14.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 +A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,14.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,23.00000000000,R1,2050,R1,power,solarPV,newcapa,2050 +A1,22.75000000000,R1,2050,R1,power,solarPV,newcapa,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 aceb7479f..46b6e12bb 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,15.14750000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,15.50320000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,9.68210000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.78050000000,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,15.14750000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,15.50320000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,9.68210000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.78050000000,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,15.14750000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,15.50320000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,9.68210000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.78050000000,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,15.14750000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,15.50320000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,9.68210000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.78050000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,15.14750000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,15.50320000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,9.68210000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.78050000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,15.14750000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,15.50320000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,9.68210000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.78050000000,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,14.87270000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.65640000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.79870000000,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,14.87270000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,8.65640000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.79870000000,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,14.87270000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.65640000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.79870000000,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,14.87270000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,8.65640000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.79870000000,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,14.87270000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,8.65640000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,8.79870000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,8.65640000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.79870000000,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.58110000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,8.54650000000,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.58110000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,8.54650000000,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.58110000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,8.54650000000,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.58110000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,8.54650000000,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.58110000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,8.54650000000,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.58110000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,8.54650000000,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.62300000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.42980000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,14.62300000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.42980000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,14.62300000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.42980000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,14.62300000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.42980000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,14.62300000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,8.42980000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.62300000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.42980000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,14.65440000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.44660000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,8.54650000000,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,14.65440000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.44660000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.54650000000,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,14.65440000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.44660000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,8.54650000000,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,14.65440000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.44660000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.54650000000,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,14.65440000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,8.44660000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.65440000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.44660000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.54650000000,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,14.87270000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.45920000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.45920000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.45920000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.45920000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.45920000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.45920000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 689c4ec6c..df7ee22df 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv @@ -30,8 +30,8 @@ A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 A1,11.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 A1,5.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2035 A1,20.00000000000,R2,2035,R2,residential,heatpump,newcapa,2035 -A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,22.00000000000,R2,2035,R2,power,windturbine,newcapa,2035 +A1,22.50000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,22.50000000000,R2,2035,R2,power,windturbine,newcapa,2035 A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2035 @@ -41,10 +41,10 @@ A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 A1,5.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 A1,17.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2040 A1,20.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 -A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,22.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 -A1,8.00000000000,R2,2040,R2,power,windturbine,newcapa,2040 +A1,22.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,8.50000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,22.50000000000,R2,2035,R2,power,windturbine,newcapa,2040 +A1,8.50000000000,R2,2040,R2,power,windturbine,newcapa,2040 A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2040 @@ -54,11 +54,11 @@ A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 A1,17.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045 A1,11.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2045 A1,20.00000000000,R2,2045,R2,residential,heatpump,newcapa,2045 -A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,22.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,8.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,22.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 -A1,8.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 +A1,22.50000000000,R2,2035,R2,power,windturbine,newcapa,2045 +A1,8.50000000000,R2,2040,R2,power,windturbine,newcapa,2045 A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2045 A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 @@ -69,12 +69,12 @@ A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 A1,11.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 A1,23.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050 A1,20.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 -A1,22.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,22.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,8.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,22.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 -A1,8.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 +A1,22.50000000000,R2,2035,R2,power,windturbine,newcapa,2050 +A1,8.50000000000,R2,2040,R2,power,windturbine,newcapa,2050 A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 A1,3.00000000000,R2,2050,R2,power,windturbine,newcapa,2050 A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 1e09b3a54..ddef0d46b 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,34.88690000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,35.81110000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,35.81110000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,12.95410000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,12.95410000000,R2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,35.81110000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,35.81110000000,R2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,12.95410000000,R1,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,12.95410000000,R2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,35.81110000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,35.81110000000,R2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,12.95410000000,R1,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,12.95410000000,R2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,35.81110000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,35.81110000000,R2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,12.95410000000,R1,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,12.95410000000,R2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,35.81110000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,35.81110000000,R2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,12.95410000000,R1,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,12.95410000000,R2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,35.81110000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,35.81110000000,R2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,12.95410000000,R1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,12.95410000000,R2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,35.81110000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,35.81110000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,15.34370000000,R1,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,15.34370000000,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,34.88690000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,35.81110000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,35.81110000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,15.34370000000,R1,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,15.34370000000,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,34.88690000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,35.81110000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,35.81110000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,15.34370000000,R1,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,15.34370000000,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,34.88690000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,35.81110000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,35.81110000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,15.34370000000,R1,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,15.34370000000,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,34.88690000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,35.81110000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,35.81110000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,15.34370000000,R1,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,15.34370000000,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,34.88690000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,35.81110000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,35.81110000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,15.34370000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,15.34370000000,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,35.43580000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,35.43580000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,19.26410000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,19.26410000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.40510000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.40510000000,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,35.43580000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,35.43580000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,19.26410000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,19.26410000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.40510000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.40510000000,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,35.43580000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,35.43580000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,19.26410000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,19.26410000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.40510000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.40510000000,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,35.43580000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,35.43580000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,19.26410000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,19.26410000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.40510000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.40510000000,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,35.43580000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,35.43580000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,19.26410000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,19.26410000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.40510000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.40510000000,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,35.43580000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,35.43580000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,19.26410000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,19.26410000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.40510000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.40510000000,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,35.17870000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,35.17870000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,20.20080000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,20.20080000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,20.44320000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,20.44320000000,R2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,35.17870000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,35.17870000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,20.20080000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,20.20080000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,20.44320000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,20.44320000000,R2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,35.17870000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,35.17870000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,20.20080000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,20.20080000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,20.44320000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,20.44320000000,R2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,35.17870000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,35.17870000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,20.20080000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,20.20080000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,20.44320000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,20.44320000000,R2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,35.17870000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,35.17870000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,20.20080000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,20.20080000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.44320000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.44320000000,R2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,35.17870000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,35.17870000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,20.20080000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,20.20080000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,20.44320000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,20.44320000000,R2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,35.25180000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,35.25180000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,21.86010000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,21.86010000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,22.07200000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,22.07200000000,R2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,35.25180000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,35.25180000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,21.86010000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,21.86010000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,22.07200000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,22.07200000000,R2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,35.25180000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,35.25180000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,21.86010000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,21.86010000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,22.07200000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,22.07200000000,R2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,35.25180000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,35.25180000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,21.86010000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,21.86010000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,22.07200000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,22.07200000000,R2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,35.25180000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,35.25180000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,21.86010000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,21.86010000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.07200000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.07200000000,R2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,35.25180000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,35.25180000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.86010000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.86010000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,22.07200000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,22.07200000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,35.31290000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,35.31290000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,23.73440000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,23.73440000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,23.92260000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,23.92260000000,R2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,35.31290000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,35.31290000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,23.73440000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,23.73440000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.92260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.92260000000,R2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,35.31290000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,35.31290000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,23.73440000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,23.73440000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,23.92260000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,23.92260000000,R2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,35.31290000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,35.31290000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,23.73440000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,23.73440000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.92260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.92260000000,R2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,35.31290000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,35.31290000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,23.73440000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,23.73440000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.92260000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.92260000000,R2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,35.31290000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,35.31290000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,23.73440000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,23.73440000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,23.92260000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,23.92260000000,R2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index add429e03..5012430c6 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -8,61 +8,61 @@ A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 -A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2030 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2035 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2040 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2045 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,20.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,electric_stove,newcapa,2050 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,32.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,9.57890000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,32.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index b000d0a0c..bf7c1af91 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,18.45130000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.98780000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.36600000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.53590000000,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,9.99810000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,18.45130000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,10.16800000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.98780000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.36600000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.53590000000,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,9.99810000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,18.45130000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,10.16800000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.98780000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.36600000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.53590000000,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,9.99810000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,18.45130000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,10.16800000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.98780000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.36600000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.53590000000,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,9.99810000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,18.45130000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,10.16800000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.98780000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.36600000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.53600000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,9.99810000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,18.45130000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,10.16800000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.98780000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.36600000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.53590000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,9.99810000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,19.17850000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,10.16800000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.38020000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,10.26880000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.34950000000,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,10.26880000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.17850000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,10.34950000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.38020000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,10.26880000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.34950000000,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,10.26880000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,19.17850000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,10.34950000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,19.38020000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,10.26880000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.34950000000,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,10.26880000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.17850000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,10.34950000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.38020000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,10.26880000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.34950000000,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,10.26880000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,19.17850000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,10.34950000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,19.38020000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.26880000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.34950000000,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,10.26880000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,19.17850000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,10.34950000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.38020000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,10.26880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.34950000000,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,10.26880000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,19.98000000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,10.34950000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.24340000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,10.58940000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,10.69480000000,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,10.58940000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,19.98000000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,10.69480000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,20.24340000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.58940000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.69480000000,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,10.58940000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,19.98000000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,10.69480000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,20.24340000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,10.58940000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,10.69480000000,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,10.58940000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,19.98000000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,10.69480000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,20.24340000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.58940000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.69480000000,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,10.58940000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,19.98000000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,10.69480000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.24340000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,10.58940000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.69480000000,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,10.58940000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,19.98000000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,10.69480000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,20.24340000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.58940000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.69480000000,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,10.58940000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,20.55170000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,10.69480000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,20.86000000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.81810000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.94140000000,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,10.81810000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,20.55170000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,10.94140000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.86000000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.94140000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,20.55170000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,10.94140000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,20.86000000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.81810000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.94140000000,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,10.81810000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,20.55170000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,10.94140000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.86000000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.94140000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,20.55170000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,10.94140000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,20.86000000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.81810000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.94140000000,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,10.81810000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,20.55170000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,10.94140000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,20.86000000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.81810000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.94140000000,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,10.81810000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,21.28220000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,10.94140000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,21.65270000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.11030000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,11.25850000000,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,11.11030000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,21.28220000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,11.25850000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.65270000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.11030000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.25850000000,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,11.11030000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,21.28220000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,11.25850000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.65270000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,11.11030000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,11.25850000000,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,11.11030000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,21.28220000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,11.25850000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.65270000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.11030000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.25850000000,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,11.11030000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,21.28220000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,11.25850000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.65270000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.11030000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.25850000000,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,11.11030000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,21.28220000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,11.25850000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.65270000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.11030000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.25850000000,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,11.11030000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,21.84970000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,22.26920000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,11.33730000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.50510000000,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,11.33730000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,21.84970000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,22.26920000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,21.84970000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,22.26920000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,11.33730000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.50510000000,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,11.33730000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,21.84970000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,22.26920000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,21.84970000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,22.26920000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,11.33730000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.50510000000,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,11.33730000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,21.84970000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,22.26920000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,11.33730000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.50510000000,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,11.33730000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv index ea846bfd2..c0aced739 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv @@ -5,18 +5,18 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,16.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 +A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2030 -A1,16.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2030 +A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,2.52000000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 -A1,16.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,2.52000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 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 ca616acb3..c5d5c2055 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,18.15070000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.58490000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.03660000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.15980000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,18.15070000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.58490000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.03660000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.15980000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,18.15070000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.58490000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.03660000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.15980000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,18.15070000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.58490000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.03660000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.15980000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,18.15070000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.58490000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.03660000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.15980000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,18.15070000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.58490000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.03660000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.15980000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,18.86150000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.96750000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,10.14200000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.18440000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.12000000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,18.86150000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.96750000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,10.14200000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.18440000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.12000000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,18.86150000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.96750000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,10.14200000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.18440000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.12000000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,18.86150000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.96750000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,10.14200000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.18440000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.12000000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,18.86150000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.96750000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.14200000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.18440000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.12000000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,18.86150000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.96750000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,10.14200000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.18440000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.14600000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,21.16800000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.05580000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.06460000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,21.14600000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,21.16800000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.05580000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.06460000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,21.14600000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,21.16800000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.05580000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.06460000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,21.14600000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,21.16800000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.05580000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.06460000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.14600000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,21.16800000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.05580000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.06460000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,21.14600000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,21.16800000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.05580000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.06460000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.19000000000,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 190708970..f1a5fe685 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 @@ -18,74 +18,74 @@ 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 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 +gas,all-week,night,all-year,R1,0.40570000000,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,22.55850000000,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 +gas,all-week,morning,all-year,R1,0.60860000000,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,33.83770000000,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 +gas,all-week,afternoon,all-year,R1,0.40570000000,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,22.55850000000,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 +gas,all-week,early-peak,all-year,R1,0.60860000000,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 -electricity,all-week,late-peak,all-year,R1,1.21670000000,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,R1,33.83770000000,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,R1,1.26670000000,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 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 +gas,all-week,evening,all-year,R1,0.81140000000,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,45.11700000000,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.50950000000,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,R1,0.49170000000,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,27.96710000000,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,R1,26.99170000000,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.76420000000,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,R1,0.73760000000,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,41.95070000000,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,R1,40.48760000000,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.50950000000,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,R1,0.49170000000,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,27.96710000000,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,R1,26.99170000000,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.76420000000,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,R1,0.73760000000,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,41.95070000000,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,R1,1.96670000000,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,R1,1.50300000000,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,R1,2.00000000000,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,R1,1.47520000000,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,R1,5.00000000000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,R1,82.50300000000,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,R1,80.97520000000,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,1.01900000000,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,R1,0.98340000000,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,55.93420000000,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,R1,53.98340000000,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.50810000000,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,R1,0.49170000000,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,27.88830000000,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,R1,26.99170000000,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.76210000000,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,R1,0.73760000000,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,41.83250000000,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,R1,40.48760000000,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.50810000000,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,R1,0.49170000000,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,27.88830000000,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,R1,26.99170000000,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.76210000000,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,R1,0.73760000000,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,41.83250000000,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,R1,2.36670000000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,R1,1.50300000000,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,R1,2.40000000000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,R1,1.47520000000,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,82.50300000000,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,R1,80.97520000000,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,1.01610000000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,R1,0.98340000000,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,55.77670000000,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index b33ce2b4c..fb43c23d0 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -5,35 +5,35 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,8.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 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 905c47137..c3a1eb9c9 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,8.52500000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.75610000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,7.64250000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.68250000000,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.52500000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.75610000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,7.64250000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.68250000000,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.41810000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,9.73430000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,8.14170000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,8.23530000000,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.52500000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.75610000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,7.64250000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.68250000000,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.52500000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.75610000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.64250000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.68250000000,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.06240000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,9.39010000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,7.94290000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,8.04080000000,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,7.19990000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.00740000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.09990000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.00740000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.09990000000,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,7.19990000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.36470000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.49110000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.00740000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.09990000000,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,7.19990000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.00740000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.09990000000,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,7.19990000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.22240000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.35350000000,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,7.05870000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,5.47740000000,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,7.05870000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,5.47740000000,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,7.05870000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,5.47740000000,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,7.05870000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,5.47740000000,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.95640000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.47740000000,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.95640000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.47740000000,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.95640000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.47740000000,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.95640000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.47740000000,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.95640000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.47740000000,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.95640000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.47740000000,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.14720000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.47740000000,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.14720000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.47740000000,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.14720000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.47740000000,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.14720000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.47740000000,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.14720000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.47740000000,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.14720000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.47740000000,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,7.05870000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.45630000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.45630000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,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,7.05870000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.45630000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.45630000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,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,7.05870000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.45630000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,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,7.05870000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.45630000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,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 7413460ca..b3263484d 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,133 +1,133 @@ 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,2025,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,10,electricity,all-week,morning,2020,all-year,R1,0.09050000000,gasCCGT,1,MUS$2010/PJ,2025 -1,10,electricity,all-week,morning,2025,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,10,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025 +1,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,gasCCGT,1,MUS$2010/PJ,2025 +1,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,7.63920000000,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,2025,all-year,R1,0.36190000000,windturbine,2,MUS$2010/PJ,2025 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,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,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,2025,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,10,electricity,all-week,early-peak,2020,all-year,R1,0.08330000000,gasCCGT,3,MUS$2010/PJ,2025 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.63920000000,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,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2025 +1,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,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,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 -1,10,electricity,all-week,evening,2025,all-year,R1,0.72380000000,windturbine,5,MUS$2010/PJ,2025 +1,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 -1,10,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,MUS$2010/PJ,2030 -2,10,electricity,all-week,night,2030,all-year,R1,0.33330000000,windturbine,0,MUS$2010/PJ,2030 -1,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -2,10,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,MUS$2010/PJ,2030 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.33330000000,windturbine,2,MUS$2010/PJ,2030 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,MUS$2010/PJ,2030 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.50000000000,windturbine,3,MUS$2010/PJ,2030 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,MUS$2010/PJ,2030 -2,10,electricity,all-week,evening,2030,all-year,R1,0.66670000000,windturbine,5,MUS$2010/PJ,2030 -1,10,electricity,all-week,night,2025,all-year,R1,0.34290000000,windturbine,0,MUS$2010/PJ,2035 -2,10,electricity,all-week,night,2030,all-year,R1,0.34290000000,windturbine,0,MUS$2010/PJ,2035 -3,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2035 -1,10,electricity,all-week,morning,2025,all-year,R1,0.51430000000,windturbine,1,MUS$2010/PJ,2035 -2,10,electricity,all-week,morning,2030,all-year,R1,0.51430000000,windturbine,1,MUS$2010/PJ,2035 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2035 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.34290000000,windturbine,2,MUS$2010/PJ,2035 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.34290000000,windturbine,2,MUS$2010/PJ,2035 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2035 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.51430000000,windturbine,3,MUS$2010/PJ,2035 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.51430000000,windturbine,3,MUS$2010/PJ,2035 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2035 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2035 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2035 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2035 -1,10,electricity,all-week,evening,2025,all-year,R1,0.68570000000,windturbine,5,MUS$2010/PJ,2035 -2,10,electricity,all-week,evening,2030,all-year,R1,0.68570000000,windturbine,5,MUS$2010/PJ,2035 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2035 -1,10,electricity,all-week,night,2025,all-year,R1,0.35000000000,windturbine,0,MUS$2010/PJ,2040 -2,10,electricity,all-week,night,2030,all-year,R1,0.35000000000,windturbine,0,MUS$2010/PJ,2040 -3,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 -4,10,electricity,all-week,night,2040,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 -1,10,electricity,all-week,morning,2025,all-year,R1,0.52500000000,windturbine,1,MUS$2010/PJ,2040 -2,10,electricity,all-week,morning,2030,all-year,R1,0.52500000000,windturbine,1,MUS$2010/PJ,2040 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 -4,10,electricity,all-week,morning,2040,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.35000000000,windturbine,2,MUS$2010/PJ,2040 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.35000000000,windturbine,2,MUS$2010/PJ,2040 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.52500000000,windturbine,3,MUS$2010/PJ,2040 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.52500000000,windturbine,3,MUS$2010/PJ,2040 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2040 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2040 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 -1,10,electricity,all-week,evening,2025,all-year,R1,0.70000000000,windturbine,5,MUS$2010/PJ,2040 -2,10,electricity,all-week,evening,2030,all-year,R1,0.70000000000,windturbine,5,MUS$2010/PJ,2040 -3,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 -4,10,electricity,all-week,evening,2040,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 -1,10,electricity,all-week,night,2025,all-year,R1,0.33680000000,windturbine,0,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2030,all-year,R1,0.33680000000,windturbine,0,MUS$2010/PJ,2045 -3,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 -4,10,electricity,all-week,night,2040,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 -5,10,electricity,all-week,night,2045,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 -1,10,electricity,all-week,morning,2025,all-year,R1,0.50530000000,windturbine,1,MUS$2010/PJ,2045 -2,10,electricity,all-week,morning,2030,all-year,R1,0.50530000000,windturbine,1,MUS$2010/PJ,2045 -3,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 -4,10,electricity,all-week,morning,2040,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 -5,10,electricity,all-week,morning,2045,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.33680000000,windturbine,2,MUS$2010/PJ,2045 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.33680000000,windturbine,2,MUS$2010/PJ,2045 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 -5,10,electricity,all-week,afternoon,2045,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.50530000000,windturbine,3,MUS$2010/PJ,2045 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.50530000000,windturbine,3,MUS$2010/PJ,2045 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 -5,10,electricity,all-week,early-peak,2045,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2045 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2045 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 -5,10,electricity,all-week,late-peak,2045,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 -1,10,electricity,all-week,evening,2025,all-year,R1,0.67370000000,windturbine,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,evening,2030,all-year,R1,0.67370000000,windturbine,5,MUS$2010/PJ,2045 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 -4,10,electricity,all-week,evening,2040,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 -5,10,electricity,all-week,evening,2045,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2030,all-year,R1,0.34290000000,windturbine,0,MUS$2010/PJ,2050 -3,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 -4,10,electricity,all-week,night,2040,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 -5,10,electricity,all-week,night,2045,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 -6,10,electricity,all-week,night,2050,all-year,R1,0.45710000000,windturbine,0,MUS$2010/PJ,2050 -2,10,electricity,all-week,morning,2030,all-year,R1,0.51430000000,windturbine,1,MUS$2010/PJ,2050 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 -4,10,electricity,all-week,morning,2040,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 -5,10,electricity,all-week,morning,2045,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 -6,10,electricity,all-week,morning,2050,all-year,R1,0.68570000000,windturbine,1,MUS$2010/PJ,2050 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.34290000000,windturbine,2,MUS$2010/PJ,2050 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 -5,10,electricity,all-week,afternoon,2045,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 -6,10,electricity,all-week,afternoon,2050,all-year,R1,0.45710000000,windturbine,2,MUS$2010/PJ,2050 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.51430000000,windturbine,3,MUS$2010/PJ,2050 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 -5,10,electricity,all-week,early-peak,2045,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 -6,10,electricity,all-week,early-peak,2050,all-year,R1,0.68570000000,windturbine,3,MUS$2010/PJ,2050 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2050 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 -5,10,electricity,all-week,late-peak,2045,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 -6,10,electricity,all-week,late-peak,2050,all-year,R1,1.33330000000,windturbine,4,MUS$2010/PJ,2050 -2,10,electricity,all-week,evening,2030,all-year,R1,0.68570000000,windturbine,5,MUS$2010/PJ,2050 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 -4,10,electricity,all-week,evening,2040,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 -5,10,electricity,all-week,evening,2045,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 -6,10,electricity,all-week,evening,2050,all-year,R1,0.91430000000,windturbine,5,MUS$2010/PJ,2050 +0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 +1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 +0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2035 +1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2035 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2035 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2035 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2035 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2035 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2035 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2035 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035 +0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2035 +1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2035 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035 +0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2040 +1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2040 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2040 +1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2040 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2040 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2040 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2040 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2040 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2040 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2040 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2040 +1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2040 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2045 +1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2045 +1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2045 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2045 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2045 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2045 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2045 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2045 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2045 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2045 +1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +0,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 +1,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +2,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,10,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 +0,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 +1,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +2,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,10,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 +0,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 +1,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +2,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,10,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 +0,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 +1,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +2,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,10,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 +0,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 +1,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +2,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,10,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +0,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 +1,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +2,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,10,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index faeff9a56..7d122ba67 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -5,35 +5,35 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,7.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 +A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,7.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,7.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,7.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,7.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 2f457b05a..6e9e1ba96 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,9.03590000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.07710000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,7.75180000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.76030000000,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.03590000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.07710000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,7.75180000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.76030000000,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,10.21280000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,10.26860000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,8.38310000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,8.39990000000,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.03590000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.07710000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,7.75180000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.76030000000,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.25580000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.30740000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.33340000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.34710000000,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.25580000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.30740000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,7.33340000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.34710000000,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,7.19990000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.21180000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.22830000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.21180000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.22830000000,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,7.19990000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.68250000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.70490000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.21180000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.22830000000,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,7.19990000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.89980000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.92040000000,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,7.19990000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,5.89980000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.92040000000,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,7.05870000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,5.47740000000,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,7.05870000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,5.47740000000,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,7.05870000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,5.47740000000,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,7.05870000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,5.47740000000,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.95640000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.47740000000,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.95640000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.47740000000,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.95640000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.47740000000,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.95640000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.47740000000,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.95640000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.47740000000,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.95640000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.47740000000,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.14720000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.47740000000,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.14720000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.47740000000,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.14720000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.47740000000,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.14720000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.47740000000,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.14720000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.47740000000,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.14720000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.47740000000,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,7.05870000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.45630000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.45630000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,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,7.05870000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.45630000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.45630000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,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,7.05870000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.45630000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,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,7.05870000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.45630000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,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 5be8eaea9..18b2e5327 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,133 +1,133 @@ 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,2025,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,10,electricity,all-week,morning,2020,all-year,R1,0.07920000000,gasCCGT,1,MUS$2010/PJ,2025 -1,10,electricity,all-week,morning,2025,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,10,electricity,all-week,night,2020,all-year,R1,0.05210000000,gasCCGT,0,MUS$2010/PJ,2025 +1,10,electricity,all-week,night,2025,all-year,R1,0.37010000000,windturbine,0,MUS$2010/PJ,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,4.77840000000,gasCCGT,0,MUS$2010/kt,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.07820000000,gasCCGT,1,MUS$2010/PJ,2025 +1,10,electricity,all-week,morning,2025,all-year,R1,0.55510000000,windturbine,1,MUS$2010/PJ,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,7.16760000000,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,2025,all-year,R1,0.36940000000,windturbine,2,MUS$2010/PJ,2025 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.37010000000,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,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,2025,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,10,electricity,all-week,early-peak,2020,all-year,R1,0.07820000000,gasCCGT,3,MUS$2010/PJ,2025 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.55510000000,windturbine,3,MUS$2010/PJ,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.16760000000,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,2025,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2025 +1,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,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,10,electricity,all-week,evening,2020,all-year,R1,0.05630000000,gasCCGT,5,MUS$2010/PJ,2025 -1,10,electricity,all-week,evening,2025,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 -1,10,electricity,all-week,night,2025,all-year,R1,0.38890000000,windturbine,0,MUS$2010/PJ,2030 -2,10,electricity,all-week,night,2030,all-year,R1,0.27780000000,windturbine,0,MUS$2010/PJ,2030 -1,10,electricity,all-week,morning,2025,all-year,R1,0.58330000000,windturbine,1,MUS$2010/PJ,2030 -2,10,electricity,all-week,morning,2030,all-year,R1,0.41670000000,windturbine,1,MUS$2010/PJ,2030 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.38890000000,windturbine,2,MUS$2010/PJ,2030 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.27780000000,windturbine,2,MUS$2010/PJ,2030 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.58330000000,windturbine,3,MUS$2010/PJ,2030 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.41670000000,windturbine,3,MUS$2010/PJ,2030 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2030 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2030 -1,10,electricity,all-week,evening,2025,all-year,R1,0.77780000000,windturbine,5,MUS$2010/PJ,2030 -2,10,electricity,all-week,evening,2030,all-year,R1,0.55560000000,windturbine,5,MUS$2010/PJ,2030 -1,10,electricity,all-week,night,2025,all-year,R1,0.40000000000,windturbine,0,MUS$2010/PJ,2035 -2,10,electricity,all-week,night,2030,all-year,R1,0.28570000000,windturbine,0,MUS$2010/PJ,2035 -3,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2035 -1,10,electricity,all-week,morning,2025,all-year,R1,0.60000000000,windturbine,1,MUS$2010/PJ,2035 -2,10,electricity,all-week,morning,2030,all-year,R1,0.42860000000,windturbine,1,MUS$2010/PJ,2035 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2035 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,windturbine,2,MUS$2010/PJ,2035 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.28570000000,windturbine,2,MUS$2010/PJ,2035 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2035 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.60000000000,windturbine,3,MUS$2010/PJ,2035 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.42860000000,windturbine,3,MUS$2010/PJ,2035 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2035 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2035 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2035 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2035 -1,10,electricity,all-week,evening,2025,all-year,R1,0.80000000000,windturbine,5,MUS$2010/PJ,2035 -2,10,electricity,all-week,evening,2030,all-year,R1,0.57140000000,windturbine,5,MUS$2010/PJ,2035 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2035 -1,10,electricity,all-week,night,2025,all-year,R1,0.40830000000,windturbine,0,MUS$2010/PJ,2040 -2,10,electricity,all-week,night,2030,all-year,R1,0.29170000000,windturbine,0,MUS$2010/PJ,2040 -3,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 -4,10,electricity,all-week,night,2040,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 -1,10,electricity,all-week,morning,2025,all-year,R1,0.61250000000,windturbine,1,MUS$2010/PJ,2040 -2,10,electricity,all-week,morning,2030,all-year,R1,0.43750000000,windturbine,1,MUS$2010/PJ,2040 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 -4,10,electricity,all-week,morning,2040,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.40830000000,windturbine,2,MUS$2010/PJ,2040 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.29170000000,windturbine,2,MUS$2010/PJ,2040 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.61250000000,windturbine,3,MUS$2010/PJ,2040 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.43750000000,windturbine,3,MUS$2010/PJ,2040 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2040 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2040 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 -1,10,electricity,all-week,evening,2025,all-year,R1,0.81670000000,windturbine,5,MUS$2010/PJ,2040 -2,10,electricity,all-week,evening,2030,all-year,R1,0.58330000000,windturbine,5,MUS$2010/PJ,2040 -3,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 -4,10,electricity,all-week,evening,2040,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 -1,10,electricity,all-week,night,2025,all-year,R1,0.39300000000,windturbine,0,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2030,all-year,R1,0.28070000000,windturbine,0,MUS$2010/PJ,2045 -3,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 -4,10,electricity,all-week,night,2040,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 -5,10,electricity,all-week,night,2045,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 -1,10,electricity,all-week,morning,2025,all-year,R1,0.58950000000,windturbine,1,MUS$2010/PJ,2045 -2,10,electricity,all-week,morning,2030,all-year,R1,0.42110000000,windturbine,1,MUS$2010/PJ,2045 -3,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 -4,10,electricity,all-week,morning,2040,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 -5,10,electricity,all-week,morning,2045,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.39300000000,windturbine,2,MUS$2010/PJ,2045 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.28070000000,windturbine,2,MUS$2010/PJ,2045 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 -5,10,electricity,all-week,afternoon,2045,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.58950000000,windturbine,3,MUS$2010/PJ,2045 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.42110000000,windturbine,3,MUS$2010/PJ,2045 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 -5,10,electricity,all-week,early-peak,2045,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.16670000000,windturbine,4,MUS$2010/PJ,2045 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2045 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 -5,10,electricity,all-week,late-peak,2045,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 -1,10,electricity,all-week,evening,2025,all-year,R1,0.78600000000,windturbine,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,evening,2030,all-year,R1,0.56140000000,windturbine,5,MUS$2010/PJ,2045 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 -4,10,electricity,all-week,evening,2040,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 -5,10,electricity,all-week,evening,2045,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2030,all-year,R1,0.28570000000,windturbine,0,MUS$2010/PJ,2050 -3,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 -4,10,electricity,all-week,night,2040,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 -5,10,electricity,all-week,night,2045,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 -6,10,electricity,all-week,night,2050,all-year,R1,0.51430000000,windturbine,0,MUS$2010/PJ,2050 -2,10,electricity,all-week,morning,2030,all-year,R1,0.42860000000,windturbine,1,MUS$2010/PJ,2050 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 -4,10,electricity,all-week,morning,2040,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 -5,10,electricity,all-week,morning,2045,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 -6,10,electricity,all-week,morning,2050,all-year,R1,0.77140000000,windturbine,1,MUS$2010/PJ,2050 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.28570000000,windturbine,2,MUS$2010/PJ,2050 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 -5,10,electricity,all-week,afternoon,2045,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 -6,10,electricity,all-week,afternoon,2050,all-year,R1,0.51430000000,windturbine,2,MUS$2010/PJ,2050 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.42860000000,windturbine,3,MUS$2010/PJ,2050 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 -5,10,electricity,all-week,early-peak,2045,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 -6,10,electricity,all-week,early-peak,2050,all-year,R1,0.77140000000,windturbine,3,MUS$2010/PJ,2050 -2,10,electricity,all-week,late-peak,2030,all-year,R1,0.83330000000,windturbine,4,MUS$2010/PJ,2050 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 -5,10,electricity,all-week,late-peak,2045,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 -6,10,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 -2,10,electricity,all-week,evening,2030,all-year,R1,0.57140000000,windturbine,5,MUS$2010/PJ,2050 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 -4,10,electricity,all-week,evening,2040,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 -5,10,electricity,all-week,evening,2045,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 -6,10,electricity,all-week,evening,2050,all-year,R1,1.02860000000,windturbine,5,MUS$2010/PJ,2050 +0,10,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025 +1,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025 +0,10,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 +1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 +0,10,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 +1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 +0,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 +1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 +0,10,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2035 +1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 +0,10,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2035 +1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2035 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2035 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2035 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2035 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2035 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2035 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2035 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035 +0,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2035 +1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2035 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035 +0,10,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2040 +1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2040 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +0,10,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2040 +1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2040 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2040 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2040 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2040 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2040 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2040 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2040 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +0,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2040 +1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2040 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +0,10,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2045 +1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +0,10,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2045 +1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2045 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2045 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2045 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2045 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2045 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2045 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2045 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +0,10,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2045 +1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +0,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2050 +1,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +2,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,10,electricity,all-week,night,2050,all-year,R1,0.52780000000,windturbine,0,MUS$2010/PJ,2050 +0,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2050 +1,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +2,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,10,electricity,all-week,morning,2050,all-year,R1,0.79170000000,windturbine,1,MUS$2010/PJ,2050 +0,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2050 +1,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +2,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,10,electricity,all-week,afternoon,2050,all-year,R1,0.52780000000,windturbine,2,MUS$2010/PJ,2050 +0,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2050 +1,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +2,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,10,electricity,all-week,early-peak,2050,all-year,R1,0.79170000000,windturbine,3,MUS$2010/PJ,2050 +0,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2050 +1,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +2,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,10,electricity,all-week,late-peak,2050,all-year,R1,1.58330000000,windturbine,4,MUS$2010/PJ,2050 +0,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2050 +1,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +2,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,10,electricity,all-week,evening,2050,all-year,R1,1.05560000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 799e4deb5..b57a8cc6a 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -3,48 +3,63 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,17.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 +A1,17.40000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,17.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,17.40000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,10.60000000000,R1,2030,R1,residential,heatpump,newcapa,2030 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2030 +A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,22.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2035 -A1,22.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,27.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,27.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,10.60000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,23.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A1,23.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,16.20000000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2040 +A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,16.20000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2045 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2045 +A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,21.80000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,5.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index e6051e7d2..8062d64f0 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,19.66930000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.96230000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.66180000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.77760000000,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,19.66930000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.96230000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.66180000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.77760000000,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,19.66930000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,19.96230000000,R1,2,MUS$2010/PJ,2025 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,10.66180000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,10.77760000000,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,19.66930000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.96230000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.66180000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.77760000000,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,19.66930000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.96230000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.66180000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.77760000000,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,19.66930000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.96230000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.66180000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.77760000000,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,19.66930000000,R1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,19.96230000000,R1,6,MUS$2010/PJ,2025 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,10.66180000000,R1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,10.77760000000,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,19.66930000000,R1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,19.96230000000,R1,7,MUS$2010/PJ,2025 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,10.66180000000,R1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,10.77760000000,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,20.14590000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,22.87850000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,10.55760000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.65060000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.14590000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,22.87850000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,10.55760000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.65060000000,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,20.14590000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,22.87850000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,10.55760000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,11.65060000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.14590000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,22.87850000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,10.55760000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.65060000000,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,20.14590000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,22.87850000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.55760000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.65060000000,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,20.14590000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,22.87850000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,10.55760000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.65060000000,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,20.14590000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,22.87850000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,10.55760000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,11.65060000000,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,20.14590000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,22.87850000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,10.55760000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,11.65060000000,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,21.73500000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,25.99690000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.15810000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.89800000000,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,21.73500000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,25.99690000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.15810000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.89800000000,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,21.73500000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,25.99690000000,R1,2,MUS$2010/PJ,2035 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,11.15810000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,12.89800000000,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,21.73500000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,25.99690000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.15810000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.89800000000,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,21.73500000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,25.99690000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.15810000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.89800000000,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,21.73500000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,25.99690000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.15810000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.89800000000,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,21.73500000000,R1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,25.99690000000,R1,6,MUS$2010/PJ,2035 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,11.15810000000,R1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,12.89800000000,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,21.73500000000,R1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,25.99690000000,R1,7,MUS$2010/PJ,2035 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,11.15810000000,R1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,12.89800000000,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,22.98980000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,28.22430000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.68510000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,13.78890000000,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,22.98980000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,28.22430000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.68510000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,13.78890000000,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,22.98980000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,28.22430000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,11.68510000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,13.78890000000,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,22.98980000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,28.22430000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.68510000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,13.78890000000,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,22.98980000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,28.22430000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.68510000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.78890000000,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,22.98980000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,28.22430000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.68510000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,13.78890000000,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,22.98980000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,28.22430000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,11.68510000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,13.78890000000,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,22.98980000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,28.22430000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,11.68510000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,13.78890000000,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,24.50140000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,31.11670000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,12.26470000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,14.94590000000,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,24.50140000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,31.11670000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.26470000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,14.94590000000,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,24.50140000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,31.11670000000,R1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,12.26470000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,14.94590000000,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,24.50140000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,31.11670000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,12.26470000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,14.94590000000,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,24.50140000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,31.11670000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.26470000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.94590000000,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,24.50140000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,31.11670000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.26470000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,14.94590000000,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,24.50140000000,R1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,31.11670000000,R1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,12.26470000000,R1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,14.94590000000,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,24.50140000000,R1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,31.11670000000,R1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,12.26470000000,R1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,14.94590000000,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,25.73530000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,33.36640000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,12.77780000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.84580000000,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,25.73530000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,33.36640000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,12.77780000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,15.84580000000,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,25.73530000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,33.36640000000,R1,2,MUS$2010/PJ,2050 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,12.77780000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,15.84580000000,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,25.73530000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,33.36640000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,12.77780000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,15.84580000000,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,25.73530000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,33.36640000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.77780000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.84580000000,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,25.73530000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,33.36640000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,12.77780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,15.84580000000,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,25.73530000000,R1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,33.36640000000,R1,6,MUS$2010/PJ,2050 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,12.77780000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,15.84580000000,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,25.73530000000,R1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,33.36640000000,R1,7,MUS$2010/PJ,2050 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,12.77780000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,15.84580000000,R1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index 6381411b9..a1cf35c01 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -3,145 +3,161 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 -A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2022 +A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2022 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2022 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2022 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2022 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2022 A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2022 A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 -A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2024 +A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2024 +A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2024 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2024 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2024 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2024 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2024 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2024 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2024 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2024 A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 -A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026 -A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2026 +A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2026 +A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2026 +A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2026 +A1,0.80000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2026 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2026 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2026 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2026 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2026 +A1,13.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2026 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2026 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2026 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2026 A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 -A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028 -A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028 -A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2028 +A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2028 +A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2028 +A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2028 +A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2028 +A1,0.40000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2028 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2028 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2028 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2028 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2028 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2028 A1,10.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2028 A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2028 -A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2028 -A1,11.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030 -A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2028 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2028 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2028 +A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2030 +A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2030 +A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2030 +A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2030 +A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2030 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2030 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2030 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2030 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2030 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2030 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2030 -A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2030 -A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2030 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 -A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 -A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032 -A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 -A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2032 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2030 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2030 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2030 +A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2032 +A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2032 +A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2032 +A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2032 +A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2032 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2032 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2032 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 -A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2032 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2032 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2032 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2032 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2032 +A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2032 A1,4.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2032 A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2032 -A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2032 -A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2032 -A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2032 -A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 -A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 -A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 -A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 -A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2034 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2032 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2032 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2032 +A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2032 +A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2034 +A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2034 +A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2034 +A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2034 +A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2034 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2034 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2034 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 -A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 -A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2034 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2034 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2034 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2034 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2034 +A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2034 +A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2034 A1,1.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2034 A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2034 -A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2034 -A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2034 -A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2034 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2034 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2034 +A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2034 A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2034 -A1,4.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 -A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 -A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 -A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 -A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2036 +A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2036 +A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2036 +A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2036 +A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2036 +A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2036 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2036 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2036 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 -A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 -A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 -A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2036 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2036 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2036 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2036 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2036 +A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2036 +A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2036 +A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2036 A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2036 -A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2036 -A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2036 -A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2036 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2036 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2036 +A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2036 A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2036 A1,1.50000000000,R1,2036,R1,gas,gassupply1,newcapa,2036 -A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 -A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 -A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 -A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038 -A1,6.00000000000,R1,2038,R1,residential,heatpump,newcapa,2038 +A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2038 +A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2038 +A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2038 +A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2038 +A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2038 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2038 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2038 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 -A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 -A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 -A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 -A1,2.00000000000,R1,2038,R1,power,windturbine,newcapa,2038 -A1,13.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040 -A1,8.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2038 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2038 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2038 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2038 +A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2038 +A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2038 +A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2038 +A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2038 +A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2040,R1,residential,heatpump,newcapa,2040 A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2022,R1,power,windturbine,newcapa,2040 -A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2040 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2040 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2040,R1,power,windturbine,newcapa,2040 A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2040 -A1,5.11670000000,R1,2028,R1,gas,gassupply1,newcapa,2040 -A1,0.42220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2040 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2040 A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 A1,1.50000000000,R1,2036,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 66e93afd5..bcd61a467 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,17.84810000000,R1,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,17.85770000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,9.94130000000,R1,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,9.94600000000,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,17.84810000000,R1,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,17.85770000000,R1,1,MUS$2010/PJ,2022 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,9.94130000000,R1,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,9.94600000000,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,17.84810000000,R1,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,17.85770000000,R1,2,MUS$2010/PJ,2022 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,9.94130000000,R1,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,9.94600000000,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,17.84810000000,R1,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,17.85770000000,R1,3,MUS$2010/PJ,2022 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,9.94130000000,R1,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,9.94600000000,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,17.84810000000,R1,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,17.85770000000,R1,4,MUS$2010/PJ,2022 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,9.94130000000,R1,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,9.94600000000,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,17.84810000000,R1,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,17.85770000000,R1,5,MUS$2010/PJ,2022 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,9.94130000000,R1,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,9.94600000000,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,17.84810000000,R1,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,17.85770000000,R1,6,MUS$2010/PJ,2022 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,9.94130000000,R1,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,9.94600000000,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,17.84810000000,R1,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,17.85770000000,R1,7,MUS$2010/PJ,2022 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,9.94130000000,R1,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,9.94600000000,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,18.34290000000,R1,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,19.06480000000,R1,0,MUS$2010/PJ,2024 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,10.23890000000,R1,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,10.46230000000,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,18.34290000000,R1,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,19.06480000000,R1,1,MUS$2010/PJ,2024 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,10.23890000000,R1,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,10.46230000000,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,18.34290000000,R1,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,19.06480000000,R1,2,MUS$2010/PJ,2024 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,10.23890000000,R1,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,10.46230000000,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,18.34290000000,R1,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,19.06480000000,R1,3,MUS$2010/PJ,2024 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,10.23890000000,R1,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,10.46230000000,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,18.34290000000,R1,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,19.06480000000,R1,4,MUS$2010/PJ,2024 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,10.23890000000,R1,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,10.46230000000,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,18.34290000000,R1,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,19.06480000000,R1,5,MUS$2010/PJ,2024 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,10.23890000000,R1,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,10.46230000000,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,18.34290000000,R1,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,19.06480000000,R1,6,MUS$2010/PJ,2024 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,10.23890000000,R1,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,10.46230000000,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,18.34290000000,R1,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,19.06480000000,R1,7,MUS$2010/PJ,2024 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,10.23890000000,R1,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,10.46230000000,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,19.19800000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,20.33580000000,R1,0,MUS$2010/PJ,2026 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,10.50420000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,10.91300000000,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,19.19800000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,20.33580000000,R1,1,MUS$2010/PJ,2026 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,10.50420000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,10.91300000000,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,19.19800000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,20.33580000000,R1,2,MUS$2010/PJ,2026 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,10.50420000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,10.91300000000,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,19.19800000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,20.33580000000,R1,3,MUS$2010/PJ,2026 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,10.50420000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,10.91300000000,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,19.19800000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,20.33580000000,R1,4,MUS$2010/PJ,2026 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,10.50420000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,10.91300000000,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,19.19800000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,20.33580000000,R1,5,MUS$2010/PJ,2026 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,10.50420000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,10.91300000000,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,19.19800000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,20.33580000000,R1,6,MUS$2010/PJ,2026 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,10.50420000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,10.91300000000,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,19.19800000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,20.33580000000,R1,7,MUS$2010/PJ,2026 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,10.50420000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,10.91300000000,R1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026 -electricity,all-week,night,all-year,21.33220000000,R1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,21.63650000000,R1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,11.15270000000,R1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,11.31520000000,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,21.33220000000,R1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,21.63650000000,R1,1,MUS$2010/PJ,2028 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,11.15270000000,R1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,11.31520000000,R1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,21.33220000000,R1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,21.63650000000,R1,2,MUS$2010/PJ,2028 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,11.15270000000,R1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,11.31520000000,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,21.33220000000,R1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,21.63650000000,R1,3,MUS$2010/PJ,2028 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,11.15270000000,R1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,11.31520000000,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,21.33220000000,R1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,21.63650000000,R1,4,MUS$2010/PJ,2028 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,11.15270000000,R1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,11.31520000000,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,21.33220000000,R1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,21.63650000000,R1,5,MUS$2010/PJ,2028 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,11.15270000000,R1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,11.31520000000,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,21.33220000000,R1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,21.63650000000,R1,6,MUS$2010/PJ,2028 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,11.15270000000,R1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,11.31520000000,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,21.33220000000,R1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,21.63650000000,R1,7,MUS$2010/PJ,2028 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,11.15270000000,R1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,11.31520000000,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,21.66670000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.83780000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.16590000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.23440000000,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,21.66670000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.83780000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.16590000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.23440000000,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,21.66670000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,21.83780000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,11.16590000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,11.23440000000,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,21.66670000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.83780000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.16590000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.23440000000,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,21.66670000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.83780000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.16590000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.23440000000,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,21.66670000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.83780000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.16590000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.23440000000,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,21.66670000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,21.83780000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,11.16590000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,11.23440000000,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,21.66670000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,21.83780000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,11.16590000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,11.23440000000,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,22.77310000000,R1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,22.96430000000,R1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,11.59290000000,R1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,11.68500000000,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,22.77310000000,R1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,22.96430000000,R1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,11.59290000000,R1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,11.68500000000,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,22.77310000000,R1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,22.96430000000,R1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,11.59290000000,R1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,11.68500000000,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,22.77310000000,R1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,22.96430000000,R1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,11.59290000000,R1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,11.68500000000,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,22.77310000000,R1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,22.96430000000,R1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,11.59290000000,R1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,11.68500000000,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,22.77310000000,R1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,22.96430000000,R1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,11.59290000000,R1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,11.68500000000,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,22.77310000000,R1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,22.96430000000,R1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,11.59290000000,R1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,11.68500000000,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,22.77310000000,R1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,22.96430000000,R1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,11.59290000000,R1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,11.68500000000,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,23.73320000000,R1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,23.93540000000,R1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,11.96350000000,R1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,12.07340000000,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,23.73320000000,R1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,23.93540000000,R1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,11.96350000000,R1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,12.07340000000,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,23.73320000000,R1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,23.93540000000,R1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,11.96350000000,R1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,12.07340000000,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,23.73320000000,R1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,23.93540000000,R1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,11.96350000000,R1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,12.07340000000,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,23.73320000000,R1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,23.93540000000,R1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,11.96350000000,R1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,12.07340000000,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,23.73320000000,R1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,23.93540000000,R1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,11.96350000000,R1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,12.07340000000,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,23.73320000000,R1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,23.93540000000,R1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,11.96350000000,R1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,12.07340000000,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,23.73320000000,R1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,23.93540000000,R1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,11.96350000000,R1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,12.07340000000,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,24.57440000000,R1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,24.78130000000,R1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,12.28820000000,R1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,12.41170000000,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,24.57440000000,R1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,24.78130000000,R1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,12.28820000000,R1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,12.41170000000,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,24.57440000000,R1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,24.78130000000,R1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,12.28820000000,R1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,12.41170000000,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,24.57440000000,R1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,24.78130000000,R1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,12.28820000000,R1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,12.41170000000,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,24.57440000000,R1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,24.78130000000,R1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,12.28820000000,R1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,12.41170000000,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,24.57440000000,R1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,24.78130000000,R1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,12.28820000000,R1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,12.41170000000,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,24.57440000000,R1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,24.78130000000,R1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,12.28820000000,R1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,12.41170000000,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,24.57440000000,R1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,24.78130000000,R1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,12.28820000000,R1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,12.41170000000,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,25.31740000000,R1,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,25.52450000000,R1,0,MUS$2010/PJ,2038 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,12.57500000000,R1,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,12.70910000000,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,25.31740000000,R1,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,25.52450000000,R1,1,MUS$2010/PJ,2038 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,12.57500000000,R1,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,12.70910000000,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,25.31740000000,R1,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,25.52450000000,R1,2,MUS$2010/PJ,2038 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,12.57500000000,R1,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,12.70910000000,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,25.31740000000,R1,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,25.52450000000,R1,3,MUS$2010/PJ,2038 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,12.57500000000,R1,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,12.70910000000,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,25.31740000000,R1,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,25.52450000000,R1,4,MUS$2010/PJ,2038 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,12.57500000000,R1,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,12.70910000000,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,25.31740000000,R1,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,25.52450000000,R1,5,MUS$2010/PJ,2038 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,12.57500000000,R1,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,12.70910000000,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,25.31740000000,R1,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,25.52450000000,R1,6,MUS$2010/PJ,2038 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,12.57500000000,R1,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,12.70910000000,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,25.31740000000,R1,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,25.52450000000,R1,7,MUS$2010/PJ,2038 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,12.57500000000,R1,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,12.70910000000,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,25.95080000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,26.18290000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.86960000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.97240000000,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,25.95080000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,26.18290000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.86960000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.97240000000,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,25.95080000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,26.18290000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,12.86960000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.97240000000,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,25.95080000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,26.18290000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.86960000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.97240000000,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,25.95080000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,26.18290000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.86960000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.97240000000,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,25.95080000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,26.18290000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.86960000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.97240000000,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,25.95080000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,26.18290000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,12.86960000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.97240000000,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,25.95080000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,26.18290000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,12.86960000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.97240000000,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/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 585563a0b..2a91c624e 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -5,56 +5,56 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2025 -A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 +A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2030 -A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,1.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2035 -A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.67000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,1.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2040 -A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,1.67000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,1.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 -A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,1.67000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,1.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2050 A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 A1,10.00000000000,R1,2050,R1,power,solarPV,newcapa,2050 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,1.67000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,9.40130000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index 3f213f3aa..811f907ed 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,16.05040000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,17.00150000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,9.60580000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.90690000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,16.05040000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,17.00150000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,9.60580000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.90690000000,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,16.05040000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,17.00150000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,9.60580000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.90690000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,16.05040000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,17.00150000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,9.60580000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.90690000000,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,16.05040000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,17.00150000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,9.60580000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.90690000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.05040000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,17.00150000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,9.60580000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.90690000000,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,16.02910000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,16.53820000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,9.00910000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.21270000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,16.02910000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,16.53820000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,9.00910000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.21270000000,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,16.02910000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,16.53820000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,9.00910000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.21270000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,16.02910000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,16.53820000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,9.00910000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.21270000000,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,16.02910000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,16.53820000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,9.00910000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.21270000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,16.02910000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.53820000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,9.00910000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,9.21270000000,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,16.17020000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,16.75420000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.06550000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.29910000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,16.17020000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.75420000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.06550000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.29910000000,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,16.17020000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,16.75420000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.06550000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.29910000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,16.17020000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.75420000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.06550000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.29910000000,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,16.17020000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,16.75420000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.06550000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.29910000000,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,16.17020000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,16.75420000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.06550000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.29910000000,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.27050000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.90840000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,9.10560000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.36080000000,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.27050000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.90840000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.10560000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.36080000000,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.27050000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.90840000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,9.10560000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.36080000000,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.27050000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.90840000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.10560000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.36080000000,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.27050000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.90840000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,9.10560000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.36080000000,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.27050000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.90840000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,9.10560000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.36080000000,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.44710000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,17.17320000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,9.17630000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.46670000000,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.44710000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,17.17320000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.17630000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.46670000000,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.44710000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,17.17320000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,9.17630000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.46670000000,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.44710000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,17.17320000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.17630000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.46670000000,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.44710000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,17.17320000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,9.17630000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.46670000000,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.44710000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.17320000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,9.17630000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.46670000000,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,16.93290000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,17.72660000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.37060000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.68810000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,16.93290000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.72660000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.37060000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.68810000000,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,16.93290000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.72660000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.37060000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.68810000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,16.93290000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.72660000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.37060000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.68810000000,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,16.93290000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.72660000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,9.37060000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.68810000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,16.93290000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.72660000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,9.37060000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.68810000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/src/muse/agents/factories.py b/src/muse/agents/factories.py index b692a329a..5788dfc7c 100644 --- a/src/muse/agents/factories.py +++ b/src/muse/agents/factories.py @@ -99,7 +99,7 @@ def create_newcapa_agent( interpolation: str = "linear", merge_transform: str | Mapping | Callable = "new", quantity: float = 0.3, - housekeeping: str | Mapping | Callable = "noop", + housekeeping: str | Mapping | Callable = "clean", retrofit_present: bool = True, **kwargs, ): diff --git a/src/muse/hooks.py b/src/muse/hooks.py index ef4f537fb..64575da4d 100644 --- a/src/muse/hooks.py +++ b/src/muse/hooks.py @@ -28,7 +28,7 @@ """ Transform at the end of each step, including new assets. """ -def housekeeping_factory(settings: str | Mapping = "noop") -> Callable: +def housekeeping_factory(settings: str | Mapping = "clean") -> Callable: """Returns a function for performing initial housekeeping. For instance, remove technologies with no capacity now or in the future. @@ -133,8 +133,13 @@ def clean(agent: Agent, assets: Dataset) -> Dataset: """Removes empty assets.""" from muse.utilities import clean_assets - years = [agent.year, agent.forecast_year] - return clean_assets(assets, years) + assets_clean = clean_assets(assets, agent.year) + + # Will run into issues if there are no assets, so just return the original array + # TODO: need a more robust solution for this problem + if len(assets_clean.asset) == 0: + return assets + return assets_clean @register_final_asset_transform(name="new") diff --git a/src/muse/utilities.py b/src/muse/utilities.py index 82f441297..0d5d6120a 100644 --- a/src/muse/utilities.py +++ b/src/muse/utilities.py @@ -244,22 +244,15 @@ def broadcast_techs( return techs.sel(second_sel) -def clean_assets(assets: xr.Dataset, years: int | Sequence[int]): +def clean_assets(assets: xr.Dataset, year: int): """Cleans up and prepares asset for current iteration. - - adds current and forecast year by backfilling missing entries + - removes data from before the specified year - removes assets for which there is no capacity now or in the future """ - if isinstance(years, Sequence): - current = min(*years) - years = sorted(set(assets.year[assets.year >= current].values).union(years)) - else: - x = set(assets.year[assets.year >= years].values) - x.add(years) - years = sorted(x) - result = assets.reindex(year=years, method="backfill").fillna(0) - not_asset = [u for u in result.dims if u != "asset"] - return result.sel(asset=result.capacity.any(not_asset)) + assets = assets.sel(year=slice(year, None)) + assets = assets.where(assets.capacity.any(dim="year"), drop=True) + return assets def filter_input( diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 6a813b9dd..9d6707290 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -5,61 +5,56 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2030 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2040 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2045 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 6b2d01f5b..94a1a3b81 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.72190000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.72190000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.72190000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.72190000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.72190000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.72190000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.87770000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.23800000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.94850000000,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,21.60150000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.87770000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.23800000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.94850000000,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,21.60150000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.87770000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,11.23800000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.94850000000,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,21.60150000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.87770000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.23800000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.94850000000,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,21.60150000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.87770000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.23800000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.94850000000,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,21.60150000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.87770000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.23800000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.94850000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.67730000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,12.23780000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.66830000000,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,24.10090000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.67730000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,12.23780000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.66830000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.67730000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,12.23780000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.66830000000,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,24.10090000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.67730000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,12.23780000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.66830000000,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,24.10090000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.67730000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,12.23780000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.66830000000,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,24.10090000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.67730000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,12.23780000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.66830000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.96280000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.91910000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.18250000000,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,25.80410000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.96280000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.91910000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.18250000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.96280000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,12.91910000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.18250000000,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,25.80410000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.96280000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.91910000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.18250000000,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,25.80410000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.96280000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.91910000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.18250000000,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,25.80410000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.96280000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.91910000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.18250000000,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,27.99370000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,25.61540000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,13.79490000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.84360000000,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,27.99370000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,25.61540000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,13.79490000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.84360000000,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,27.99370000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,25.61540000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,13.79490000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.84360000000,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,27.99370000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,25.61540000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,13.79490000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.84360000000,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,27.99370000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,25.61540000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,13.79490000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.84360000000,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,27.99370000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,13.79490000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.47410000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,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,29.69170000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,14.47410000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.47410000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,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,29.69170000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,14.47410000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,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,29.69170000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.47410000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,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,29.69170000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,14.47410000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv index b33ce2b4c..fb43c23d0 100644 --- a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv @@ -5,35 +5,35 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2035 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2040 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,8.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 99e3d7a83..98e28b6bf 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,8.60100000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.84520000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,7.66660000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.71080000000,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.60100000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.84520000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,7.66660000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.71080000000,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.60100000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.84520000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,7.66660000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.71080000000,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.60100000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.84520000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,7.66660000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.71080000000,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.60100000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.84520000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.66660000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.71080000000,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.60100000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.84520000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,7.66660000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.71080000000,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,7.19990000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,6.03780000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,6.13550000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,6.03780000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,6.13550000000,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,7.19990000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,6.03780000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,6.13550000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,6.03780000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,6.13550000000,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,7.19990000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,6.03780000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,6.13550000000,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,7.19990000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.03780000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.13550000000,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,7.05870000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,5.47740000000,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,7.05870000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,5.47740000000,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,7.05870000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,5.47740000000,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,7.05870000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,5.47740000000,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.95640000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.47740000000,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.95640000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.47740000000,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.95640000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.47740000000,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.95640000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.47740000000,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.95640000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.47740000000,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.95640000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.47740000000,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.14720000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.47740000000,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.14720000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.47740000000,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.14720000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.47740000000,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.14720000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.47740000000,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.14720000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.47740000000,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.14720000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.47740000000,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,7.05870000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.45630000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.45630000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,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,7.05870000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.45630000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.45630000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,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,7.05870000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.45630000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,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,7.05870000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.45630000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index bb911cbff..a23fbe686 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -1,133 +1,133 @@ 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,2025,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,10,electricity,all-week,morning,2020,all-year,R1,0.09050000000,gasCCGT,1,MUS$2010/PJ,2025 -1,10,electricity,all-week,morning,2025,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,10,electricity,all-week,afternoon,2020,all-year,R1,0.06030000000,gasCCGT,2,MUS$2010/PJ,2025 -1,10,electricity,all-week,afternoon,2025,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,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,2025,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,10,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025 +1,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2025 +0,6,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025 +0,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,gasCCGT,1,MUS$2010/PJ,2025 +1,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2025 +0,6,CO2f,all-week,morning,2020,all-year,R1,7.63920000000,gasCCGT,1,MUS$2010/kt,2025 +0,10,electricity,all-week,afternoon,2020,all-year,R1,0.05560000000,gasCCGT,2,MUS$2010/PJ,2025 +1,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2025 +0,6,CO2f,all-week,afternoon,2020,all-year,R1,5.09280000000,gasCCGT,2,MUS$2010/kt,2025 +0,10,electricity,all-week,early-peak,2020,all-year,R1,0.08330000000,gasCCGT,3,MUS$2010/PJ,2025 +1,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2025 +0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.63920000000,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,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2025 +1,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,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,10,electricity,all-week,evening,2020,all-year,R1,0.12060000000,gasCCGT,5,MUS$2010/PJ,2025 -1,10,electricity,all-week,evening,2025,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 -1,10,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,MUS$2010/PJ,2030 -2,10,electricity,all-week,night,2030,all-year,R1,0.33330000000,windturbine,0,MUS$2010/PJ,2030 -1,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -2,10,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,1,MUS$2010/PJ,2030 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,MUS$2010/PJ,2030 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.33330000000,windturbine,2,MUS$2010/PJ,2030 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,MUS$2010/PJ,2030 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.50000000000,windturbine,3,MUS$2010/PJ,2030 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2030 -1,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,MUS$2010/PJ,2030 -2,10,electricity,all-week,evening,2030,all-year,R1,0.66670000000,windturbine,5,MUS$2010/PJ,2030 -1,10,electricity,all-week,night,2025,all-year,R1,0.34290000000,windturbine,0,MUS$2010/PJ,2035 -2,10,electricity,all-week,night,2030,all-year,R1,0.34290000000,windturbine,0,MUS$2010/PJ,2035 -3,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2035 -1,10,electricity,all-week,morning,2025,all-year,R1,0.51430000000,windturbine,1,MUS$2010/PJ,2035 -2,10,electricity,all-week,morning,2030,all-year,R1,0.51430000000,windturbine,1,MUS$2010/PJ,2035 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2035 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.34290000000,windturbine,2,MUS$2010/PJ,2035 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.34290000000,windturbine,2,MUS$2010/PJ,2035 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2035 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.51430000000,windturbine,3,MUS$2010/PJ,2035 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.51430000000,windturbine,3,MUS$2010/PJ,2035 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2035 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2035 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2035 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2035 -1,10,electricity,all-week,evening,2025,all-year,R1,0.68570000000,windturbine,5,MUS$2010/PJ,2035 -2,10,electricity,all-week,evening,2030,all-year,R1,0.68570000000,windturbine,5,MUS$2010/PJ,2035 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2035 -1,10,electricity,all-week,night,2025,all-year,R1,0.35000000000,windturbine,0,MUS$2010/PJ,2040 -2,10,electricity,all-week,night,2030,all-year,R1,0.35000000000,windturbine,0,MUS$2010/PJ,2040 -3,10,electricity,all-week,night,2035,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 -4,10,electricity,all-week,night,2040,all-year,R1,0.11670000000,windturbine,0,MUS$2010/PJ,2040 -1,10,electricity,all-week,morning,2025,all-year,R1,0.52500000000,windturbine,1,MUS$2010/PJ,2040 -2,10,electricity,all-week,morning,2030,all-year,R1,0.52500000000,windturbine,1,MUS$2010/PJ,2040 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 -4,10,electricity,all-week,morning,2040,all-year,R1,0.17500000000,windturbine,1,MUS$2010/PJ,2040 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.35000000000,windturbine,2,MUS$2010/PJ,2040 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.35000000000,windturbine,2,MUS$2010/PJ,2040 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11670000000,windturbine,2,MUS$2010/PJ,2040 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.52500000000,windturbine,3,MUS$2010/PJ,2040 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.52500000000,windturbine,3,MUS$2010/PJ,2040 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.17500000000,windturbine,3,MUS$2010/PJ,2040 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2040 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2040 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2040 -1,10,electricity,all-week,evening,2025,all-year,R1,0.70000000000,windturbine,5,MUS$2010/PJ,2040 -2,10,electricity,all-week,evening,2030,all-year,R1,0.70000000000,windturbine,5,MUS$2010/PJ,2040 -3,10,electricity,all-week,evening,2035,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 -4,10,electricity,all-week,evening,2040,all-year,R1,0.23330000000,windturbine,5,MUS$2010/PJ,2040 -1,10,electricity,all-week,night,2025,all-year,R1,0.33680000000,windturbine,0,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2030,all-year,R1,0.33680000000,windturbine,0,MUS$2010/PJ,2045 -3,10,electricity,all-week,night,2035,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 -4,10,electricity,all-week,night,2040,all-year,R1,0.11230000000,windturbine,0,MUS$2010/PJ,2045 -5,10,electricity,all-week,night,2045,all-year,R1,0.16840000000,windturbine,0,MUS$2010/PJ,2045 -1,10,electricity,all-week,morning,2025,all-year,R1,0.50530000000,windturbine,1,MUS$2010/PJ,2045 -2,10,electricity,all-week,morning,2030,all-year,R1,0.50530000000,windturbine,1,MUS$2010/PJ,2045 -3,10,electricity,all-week,morning,2035,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 -4,10,electricity,all-week,morning,2040,all-year,R1,0.16840000000,windturbine,1,MUS$2010/PJ,2045 -5,10,electricity,all-week,morning,2045,all-year,R1,0.25260000000,windturbine,1,MUS$2010/PJ,2045 -1,10,electricity,all-week,afternoon,2025,all-year,R1,0.33680000000,windturbine,2,MUS$2010/PJ,2045 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.33680000000,windturbine,2,MUS$2010/PJ,2045 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11230000000,windturbine,2,MUS$2010/PJ,2045 -5,10,electricity,all-week,afternoon,2045,all-year,R1,0.16840000000,windturbine,2,MUS$2010/PJ,2045 -1,10,electricity,all-week,early-peak,2025,all-year,R1,0.50530000000,windturbine,3,MUS$2010/PJ,2045 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.50530000000,windturbine,3,MUS$2010/PJ,2045 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.16840000000,windturbine,3,MUS$2010/PJ,2045 -5,10,electricity,all-week,early-peak,2045,all-year,R1,0.25260000000,windturbine,3,MUS$2010/PJ,2045 -1,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2045 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2045 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2045 -5,10,electricity,all-week,late-peak,2045,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2045 -1,10,electricity,all-week,evening,2025,all-year,R1,0.67370000000,windturbine,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,evening,2030,all-year,R1,0.67370000000,windturbine,5,MUS$2010/PJ,2045 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 -4,10,electricity,all-week,evening,2040,all-year,R1,0.22460000000,windturbine,5,MUS$2010/PJ,2045 -5,10,electricity,all-week,evening,2045,all-year,R1,0.33680000000,windturbine,5,MUS$2010/PJ,2045 -2,10,electricity,all-week,night,2030,all-year,R1,0.34290000000,windturbine,0,MUS$2010/PJ,2050 -3,10,electricity,all-week,night,2035,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 -4,10,electricity,all-week,night,2040,all-year,R1,0.11430000000,windturbine,0,MUS$2010/PJ,2050 -5,10,electricity,all-week,night,2045,all-year,R1,0.17140000000,windturbine,0,MUS$2010/PJ,2050 -6,10,electricity,all-week,night,2050,all-year,R1,0.45710000000,windturbine,0,MUS$2010/PJ,2050 -2,10,electricity,all-week,morning,2030,all-year,R1,0.51430000000,windturbine,1,MUS$2010/PJ,2050 -3,10,electricity,all-week,morning,2035,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 -4,10,electricity,all-week,morning,2040,all-year,R1,0.17140000000,windturbine,1,MUS$2010/PJ,2050 -5,10,electricity,all-week,morning,2045,all-year,R1,0.25710000000,windturbine,1,MUS$2010/PJ,2050 -6,10,electricity,all-week,morning,2050,all-year,R1,0.68570000000,windturbine,1,MUS$2010/PJ,2050 -2,10,electricity,all-week,afternoon,2030,all-year,R1,0.34290000000,windturbine,2,MUS$2010/PJ,2050 -3,10,electricity,all-week,afternoon,2035,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 -4,10,electricity,all-week,afternoon,2040,all-year,R1,0.11430000000,windturbine,2,MUS$2010/PJ,2050 -5,10,electricity,all-week,afternoon,2045,all-year,R1,0.17140000000,windturbine,2,MUS$2010/PJ,2050 -6,10,electricity,all-week,afternoon,2050,all-year,R1,0.45710000000,windturbine,2,MUS$2010/PJ,2050 -2,10,electricity,all-week,early-peak,2030,all-year,R1,0.51430000000,windturbine,3,MUS$2010/PJ,2050 -3,10,electricity,all-week,early-peak,2035,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 -4,10,electricity,all-week,early-peak,2040,all-year,R1,0.17140000000,windturbine,3,MUS$2010/PJ,2050 -5,10,electricity,all-week,early-peak,2045,all-year,R1,0.25710000000,windturbine,3,MUS$2010/PJ,2050 -6,10,electricity,all-week,early-peak,2050,all-year,R1,0.68570000000,windturbine,3,MUS$2010/PJ,2050 -2,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,MUS$2010/PJ,2050 -3,10,electricity,all-week,late-peak,2035,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 -4,10,electricity,all-week,late-peak,2040,all-year,R1,0.33330000000,windturbine,4,MUS$2010/PJ,2050 -5,10,electricity,all-week,late-peak,2045,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2050 -6,10,electricity,all-week,late-peak,2050,all-year,R1,1.33330000000,windturbine,4,MUS$2010/PJ,2050 -2,10,electricity,all-week,evening,2030,all-year,R1,0.68570000000,windturbine,5,MUS$2010/PJ,2050 -3,10,electricity,all-week,evening,2035,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 -4,10,electricity,all-week,evening,2040,all-year,R1,0.22860000000,windturbine,5,MUS$2010/PJ,2050 -5,10,electricity,all-week,evening,2045,all-year,R1,0.34290000000,windturbine,5,MUS$2010/PJ,2050 -6,10,electricity,all-week,evening,2050,all-year,R1,0.91430000000,windturbine,5,MUS$2010/PJ,2050 +0,10,electricity,all-week,evening,2020,all-year,R1,0.11110000000,gasCCGT,5,MUS$2010/PJ,2025 +1,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 +0,6,CO2f,all-week,evening,2020,all-year,R1,10.18560000000,gasCCGT,5,MUS$2010/kt,2025 +0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 +1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 +0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2035 +1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2035 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2035 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2035 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2035 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2035 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2035 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2035 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035 +0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2035 +1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2035 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035 +0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2040 +1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2040 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040 +0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2040 +1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2040 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2040 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2040 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2040 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2040 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2040 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2040 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040 +0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2040 +1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2040 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040 +0,10,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2045 +1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2045 +2,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045 +0,10,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2045 +1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2045 +2,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045 +0,10,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2045 +1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2045 +2,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045 +0,10,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2045 +1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2045 +2,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045 +0,10,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2045 +1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2045 +2,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045 +0,10,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2045 +1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2045 +2,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +0,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 +1,10,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +2,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,10,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 +0,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 +1,10,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +2,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,10,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 +0,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 +1,10,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +2,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,10,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 +0,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 +1,10,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +2,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,10,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 +0,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 +1,10,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +2,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,10,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +0,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 +1,10,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +2,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,10,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index a4970d35e..47c2dd664 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -8,60 +8,66 @@ A1,8.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025 A1,4.00000000000,R1,2025,R1,residential,gasstove,newcapa,2025 A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2025 -A1,5.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2030 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,5.04670000000,R1,2030,R1,residential,gasboiler,newcapa,2030 A1,4.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030 A1,11.00000000000,R1,2030,R1,residential,gasstove,newcapa,2030 A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,5.95330000000,R1,2030,R1,residential,heatpump,newcapa,2030 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2030 -A1,5.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,5.04670000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A1,11.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035 A1,7.00000000000,R1,2035,R1,residential,gasstove,newcapa,2035 -A1,5.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,8.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.95330000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,7.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,7.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040 A1,14.00000000000,R1,2040,R1,residential,gasstove,newcapa,2040 -A1,8.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,13.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,7.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,14.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,14.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045 A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2045 -A1,13.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,14.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,0.20670000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2045 A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 A1,17.00000000000,R1,2050,R1,residential,gasstove,newcapa,2050 -A1,11.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,16.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,9.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,17.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,8.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,10.33930000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,5.28740000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2050 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,0.20670000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2050 A1,3.33330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 2dd86a3d7..e3ddfa9ba 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,18.57780000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.24120000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.45710000000,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,5.14740000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,18.57780000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.24120000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.45710000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,18.57780000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.24120000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.45710000000,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,5.14740000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,18.57780000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.24120000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.45710000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,18.57780000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.24120000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.45710000000,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,5.14740000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,18.57780000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.24120000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.45710000000,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,5.14740000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,17.14260000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.98130000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.06400000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.55150000000,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,5.14740000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,17.14260000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.98130000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.06410000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.55160000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,17.14260000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.98130000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,11.06400000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.55150000000,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,5.14740000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,17.14260000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.98130000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.06410000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.55160000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,17.14260000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.98130000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.06410000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.55160000000,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,5.14740000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,17.14260000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.98130000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.06410000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.55160000000,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,5.14740000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,17.00770000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,19.47080000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.78420000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.51550000000,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,5.14740000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,17.00770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.47080000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.78430000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.51550000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,17.00770000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.47080000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.78420000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.51550000000,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,5.14740000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,17.00770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.47080000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.78430000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.51550000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,17.00770000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.47080000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.78430000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.51560000000,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,5.14740000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,17.00770000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.47080000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.78430000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.51560000000,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,5.14740000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,17.39110000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,19.34930000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,9.40050000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.33710000000,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,5.14740000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,17.39110000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,19.34930000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.40050000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.33710000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,17.39110000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,19.34930000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,9.40050000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.33710000000,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,5.14740000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,17.39110000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,19.34930000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.40050000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.33710000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,17.39110000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,19.34930000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,9.40050000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.33710000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,17.39110000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,19.34930000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,9.40050000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.33710000000,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,5.14740000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,17.46810000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,19.72330000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,9.55380000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,10.48670000000,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.14740000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,17.46810000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.72330000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.55380000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.48670000000,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.14740000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,17.46810000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,19.72330000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,9.55380000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,10.48670000000,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.14740000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,17.46810000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.72330000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.55380000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.48670000000,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.14740000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,17.46810000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,19.72330000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,9.55380000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,10.48670000000,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.14740000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,17.46810000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.72330000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,9.55380000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,10.48670000000,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.14740000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,17.52790000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,20.01420000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.58470000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,10.60310000000,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.14740000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,17.52790000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.01420000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.58470000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.60310000000,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.14740000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,17.52790000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.01420000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.58470000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,10.60310000000,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.14740000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,17.52790000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.01420000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.58470000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.60310000000,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.14740000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,17.52790000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,20.01420000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,9.58470000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,10.60310000000,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.14740000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,17.52790000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,20.01420000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,9.58470000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.60310000000,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.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index f1e0d53a3..4609502be 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -8,71 +8,66 @@ A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A2,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2025 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2025 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A2,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2030 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2040 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2045 +A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,3.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,4.39560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 6b2d01f5b..94a1a3b81 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.72190000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.72190000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.72190000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.72190000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.72190000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.72190000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.87770000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.23800000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.94850000000,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,21.60150000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.87770000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.23800000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.94850000000,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,21.60150000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.87770000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,11.23800000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.94850000000,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,21.60150000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.87770000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.23800000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.94850000000,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,21.60150000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.87770000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.23800000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.94850000000,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,21.60150000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.87770000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.23800000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.94850000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.67730000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,12.23780000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.66830000000,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,24.10090000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.67730000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,12.23780000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.66830000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.67730000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,12.23780000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.66830000000,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,24.10090000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.67730000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,12.23780000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.66830000000,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,24.10090000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.67730000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,12.23780000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.66830000000,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,24.10090000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.67730000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,12.23780000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.66830000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.96280000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.91910000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.18250000000,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,25.80410000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.96280000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.91910000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.18250000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.96280000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,12.91910000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.18250000000,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,25.80410000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.96280000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.91910000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.18250000000,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,25.80410000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.96280000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.91910000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.18250000000,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,25.80410000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.96280000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.91910000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.18250000000,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,27.99370000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,25.61540000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,13.79490000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.84360000000,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,27.99370000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,25.61540000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,13.79490000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.84360000000,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,27.99370000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,25.61540000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,13.79490000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.84360000000,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,27.99370000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,25.61540000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,13.79490000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.84360000000,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,27.99370000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,25.61540000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,13.79490000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.84360000000,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,27.99370000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,13.79490000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.47410000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,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,29.69170000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,14.47410000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.47410000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,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,29.69170000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,14.47410000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,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,29.69170000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.47410000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,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,29.69170000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,14.47410000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCACapacity.csv b/tests/example_outputs/trade/Results/MCACapacity.csv index e2e0b4a3f..b2d5f949d 100644 --- a/tests/example_outputs/trade/Results/MCACapacity.csv +++ b/tests/example_outputs/trade/Results/MCACapacity.csv @@ -5,27 +5,22 @@ A1,240.00000000000,R1,2010,R1,power,gasCCGT,agent,2020 A1,200.00000000000,R2,2010,R2,power,gasCCGT,agent,2020 A1,3000.00000000000,R1,2010,R1,gas,gassupply1,agent,2020 A1,1200.00000000000,R2,2010,R2,gas,gassupply1,agent,2020 -A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2025 -A1,355.93470000000,R1,2025,R1,residential,gasboiler,retrofit,2025 -A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2025 +A1,563.34600000000,R1,2010,R1,residential,gasboiler,retrofit,2025 +A1,256.52070000000,R1,2025,R1,residential,gasboiler,retrofit,2025 A1,192.00000000000,R1,2010,R1,power,gasCCGT,agent,2025 A1,140.00000000000,R2,2010,R2,power,gasCCGT,agent,2025 -A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2025 -A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2025 A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2030 -A1,355.93470000000,R1,2025,R1,residential,gasboiler,retrofit,2030 -A1,74.53330000000,R1,2030,R1,residential,gasboiler,retrofit,2030 +A1,256.52070000000,R1,2025,R1,residential,gasboiler,retrofit,2030 +A1,173.94730000000,R1,2030,R1,residential,gasboiler,retrofit,2030 A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2030 A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030 A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030 A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030 A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030 A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035 -A1,74.53330000000,R1,2030,R1,residential,gasboiler,retrofit,2035 -A1,444.15780000000,R1,2035,R1,residential,gasboiler,retrofit,2035 -A1,17.15000000000,R2,2010,R2,residential,gasboiler,retrofit,2035 -A1,1.63330000000,R2,2035,R2,residential,gasboiler,retrofit,2035 +A1,173.94730000000,R1,2030,R1,residential,gasboiler,retrofit,2035 +A1,344.74380000000,R1,2035,R1,residential,gasboiler,retrofit,2035 +A1,20.82500000000,R2,2010,R2,residential,gasboiler,retrofit,2035 +A1,18.78330000000,R2,2035,R2,residential,gasboiler,retrofit,2035 A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035 A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035 -A1,1470.00000000000,R1,2010,R1,gas,gassupply1,agent,2035 -A1,490.00000000000,R2,2010,R2,gas,gassupply1,agent,2035 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index 118984620..20cfa264b 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -23,111 +23,111 @@ electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,150.90120000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,150.90120000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,21.63640000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,115.63450000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,21.44510000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,175.99040000000,R2,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,night,all-year,151.33800000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,21.45190000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,213.58660000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,150.90120000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,150.90120000000,R2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,21.63640000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,115.63450000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,21.44510000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,175.99040000000,R2,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,151.33800000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,21.45190000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,213.58660000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,150.90120000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,150.90120000000,R2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,21.63640000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,115.63450000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,21.44510000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,175.99040000000,R2,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,151.33800000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,21.45190000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,213.58660000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,150.90120000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,150.90120000000,R2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,21.63640000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,115.63450000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,21.44510000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,175.99040000000,R2,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,151.33800000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,21.45190000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,213.58660000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,150.90120000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,150.90120000000,R2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,21.63640000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,115.63450000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,21.44510000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,175.99040000000,R2,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,151.33800000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,21.45190000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,213.58660000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,150.90120000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,150.90120000000,R2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,21.63640000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,115.63450000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,21.44510000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,175.99040000000,R2,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,151.33800000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,21.45190000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,213.58660000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,150.90120000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,150.90120000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,29.89130000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,164.78670000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,200.49020000000,R2,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,31.04120000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,247.37670000000,R2,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,night,all-year,297.19550000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,150.90120000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,150.90120000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,29.89130000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,164.78670000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,200.49020000000,R2,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,31.04120000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,247.37670000000,R2,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,297.19550000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,150.90120000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,150.90120000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,29.89130000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,164.78670000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,200.49020000000,R2,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,31.04120000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,247.37670000000,R2,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,297.19550000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,150.90120000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,150.90120000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,29.89130000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,164.78670000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,200.49020000000,R2,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,31.04120000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,247.37670000000,R2,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,297.19550000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,150.90120000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,150.90120000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,29.89130000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,164.78670000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,200.49020000000,R2,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,31.04120000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,247.37670000000,R2,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,297.19550000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,150.90120000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,150.90120000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,29.89130000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,164.78670000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,200.49020000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,31.04120000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,247.37670000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,8677.86150000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,8677.86150000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,297.19550000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,946.04720000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,946.04720000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,42.27370000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,216.76620000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,45.43210000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,329.68250000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,8677.86150000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,8677.86150000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,night,all-year,262.75220000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,45.45620000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,390.26630000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,946.04720000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,946.04720000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,42.27370000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,216.76620000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,45.43210000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,329.68250000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,8677.86150000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,8677.86150000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,262.75220000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,45.45620000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,390.26630000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,946.04720000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,946.04720000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,42.27370000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,216.76620000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,45.43210000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,329.68250000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,8677.86150000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,8677.86150000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,262.75220000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,45.45620000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,390.26630000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,946.04720000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,946.04720000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,42.27370000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,216.76620000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,45.43210000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,329.68250000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,8677.86150000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,8677.86150000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,262.75220000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,45.45620000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,390.26630000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,946.04720000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,946.04720000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,42.27370000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,216.76620000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,45.43210000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,329.68250000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,8677.86150000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,8677.86150000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,262.75220000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,45.45620000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,390.26630000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,946.04720000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,946.04720000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,42.27370000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,216.76620000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,45.43210000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,329.68250000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,262.75220000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,45.45620000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,390.26630000000,R2,5,MUS$2010/PJ,2035