diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv index a299a2d97..0ed971b73 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv @@ -18,47 +18,47 @@ A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 @@ -66,22 +66,22 @@ A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 @@ -90,24 +90,24 @@ A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,0.90630000000,R1,2045,R1,power,windturbine,newcapa,2050 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,3.15630000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,2.40630000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 A1,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index c0b4ae36f..ed28cd276 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.18940000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,1.05280000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.91960000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.86100000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.18940000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,1.05280000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.91960000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.86100000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.18940000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,1.05280000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.91960000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.86100000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.18940000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,1.05280000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.91960000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.86100000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.18940000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,1.05280000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.91960000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.86100000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.18940000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,1.05280000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.91960000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.86100000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.32670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,1.14160000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.67440000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.14890000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.32670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,1.14160000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.67440000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.14890000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.32670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,1.14160000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.67440000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.14890000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.32670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,1.14160000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.67440000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.14890000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.32670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,1.14160000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.67440000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.14890000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.32670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,1.14160000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.67440000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.14890000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.69200000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,1.46590000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,18.20480000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.92760000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.69200000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,1.46590000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.20480000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.92760000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,2.69200000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,1.46590000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,18.20480000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.92760000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.69200000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,1.46590000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.20480000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.92760000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.69200000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,1.46590000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.20480000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,13.92760000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.69200000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,1.46590000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.20480000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.92760000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,2.85460000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,1.78340000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.64740000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.88880000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.85460000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,1.78340000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.64740000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.88880000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,2.85460000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,1.78340000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,18.64740000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.88880000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.85460000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,1.78340000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.64740000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.88880000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.85460000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,1.78340000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.64740000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,15.88880000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.85460000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,1.78340000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.64740000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,15.88880000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,3.10970000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,2.22980000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,19.78490000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,18.74330000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,3.10970000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,2.22980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.78490000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,18.74330000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,3.10970000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,2.22980000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,19.78490000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,18.74330000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,3.10970000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,2.22980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.78490000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,18.74330000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,3.10970000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,2.22980000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,19.78490000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,18.74330000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,3.10970000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,2.22980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.78490000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,18.74330000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,3.31490000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,2.67440000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,19.53380000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.32000000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,3.31490000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,2.67440000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.53380000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.32000000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,3.31490000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,2.67440000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,19.53380000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.32000000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,3.31490000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,2.67440000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.53380000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.32000000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,3.31490000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,2.67440000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.53380000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,21.32000000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,3.31490000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,2.67440000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.53380000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.32000000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 4dd9eb605..a4f8d9226 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -7,89 +7,96 @@ A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 +A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2035 -A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2040 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2040 -A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2045 -A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,6.59380000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,8.53130000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index d436df88e..af9577817 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.12460000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.61280000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.91960000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.86100000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.12460000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.61280000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.91960000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.86100000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.12460000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.61280000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.91960000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.86100000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.12460000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.61280000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.91960000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.86100000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.12460000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.61280000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.91960000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.86100000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.12460000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.61280000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.91960000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.86100000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.32670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.39560000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.67440000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.14890000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.32670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.39560000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.67440000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.14890000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.32670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.39560000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.67440000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.14890000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.32670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.39560000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.67440000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.14890000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.32670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.39560000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.67440000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.14890000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.32670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.39560000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.67440000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.14890000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.69200000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.42000000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,18.20480000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.92760000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.69200000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.42000000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.20480000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.92760000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,2.69200000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.42000000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,18.20480000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.92760000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.69200000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.42000000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.20480000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.92760000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.69200000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.42000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.20480000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,13.92760000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.69200000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.42000000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.20480000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.92760000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,2.85460000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.43080000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.77180000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,13.00110000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.85460000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.43080000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.77180000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,13.00110000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,2.85460000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.43080000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.77180000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,13.00110000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.85460000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.43080000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.77180000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,13.00110000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.85460000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.43080000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.77180000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.00110000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.85460000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.43080000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.77180000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,13.00110000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,3.10970000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.44780000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.61580000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.24370000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,3.10970000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.44780000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.61580000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.24370000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,3.10970000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.44780000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.61580000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.24370000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,3.10970000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.44780000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.61580000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.24370000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,3.10970000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.44780000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.61580000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.24370000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,3.10970000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.44780000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.61580000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.24370000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,3.32410000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.46210000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,17.86660000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.74410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,3.32410000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.46210000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.86660000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.74410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,3.32410000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.46210000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.86660000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.74410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,3.32410000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.46210000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.86660000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.74410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,3.32410000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.46210000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.86660000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.74410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,3.32410000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.46210000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.86660000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.74410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 637d5a297..81c8cb97e 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv @@ -9,35 +9,30 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,7.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,1.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index 2b564aa75..c8b006471 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.42260000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.74180000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.37150000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.73650000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.42260000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.74180000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.37150000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.73650000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.42260000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.74180000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.37150000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.73650000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.42260000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.74180000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.37150000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.73650000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.42260000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.74180000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.37150000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.73650000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.42260000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.74180000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.37150000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.73650000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.98680000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.85650000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.48640000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.98680000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43960000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.85650000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.48640000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.98680000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,19.85650000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.48640000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.98680000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43960000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.85650000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.48640000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.98680000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43960000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,19.85650000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.48640000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.98680000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43960000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.85650000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.48640000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.62270000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.48200000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.01050000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.40110000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.62270000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.48200000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.01050000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.40110000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.62270000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.48200000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.01050000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.40110000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.62270000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.48200000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.01050000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.40110000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.62270000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.48200000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.01050000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.40110000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.62270000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.48200000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.01050000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.40110000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,4.40730000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.53430000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.78520000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.06220000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,4.40730000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.53430000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.78520000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.06220000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,4.40730000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.53430000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.78520000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.06220000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,4.40730000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.53430000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.78520000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.06220000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,4.40730000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.53430000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.78520000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.06220000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,4.40730000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.53430000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.78520000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.06220000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,5.50800000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.60770000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,26.46380000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.10320000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,5.50800000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.60770000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,26.46380000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.10320000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,5.50800000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.60770000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,26.46380000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.10320000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,5.50800000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.60770000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,26.46380000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.10320000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,5.50800000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.60770000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,26.46380000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.10320000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,5.50800000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.60770000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,26.46380000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.10320000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,6.34520000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.66350000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.00280000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.18620000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,6.34520000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.66350000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.00280000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.18620000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,6.34520000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.66350000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.00280000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.18620000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,6.34520000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.66350000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.00280000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.18620000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,6.34520000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.66350000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.00280000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.18620000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,6.34520000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.66350000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.00280000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.18620000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index 9b5b76e2c..a8aaa10bb 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 @@ -4,58 +4,36 @@ 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,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2025 -A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2025 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2030 -A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2030 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2035 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2040 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2045 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,7.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,7.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,22.00000000000,R1,2045,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 b43e23033..dc4bef5f0 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.36010000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62520000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,15.14750000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.68210000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.36010000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62520000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,15.14750000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.68210000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.36010000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62520000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,15.14750000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.68210000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.36010000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62520000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,15.14750000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.68210000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.36010000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62520000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,15.14750000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.68210000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.36010000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62520000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,15.14750000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.68210000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.92930000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43580000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,14.16450000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.20200000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.92930000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43580000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,14.16450000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.20200000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.92930000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43580000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,14.16450000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.20200000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.92930000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43580000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,14.16450000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.20200000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.92930000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43580000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,14.16450000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,8.20200000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.92930000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43580000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.16450000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.20200000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.30930000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46110000000,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.26320000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.30930000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46110000000,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.26320000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.30930000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46110000000,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.26320000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.30930000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46110000000,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.26320000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.30930000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46110000000,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.26320000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.30930000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46110000000,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.26320000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.60890000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48110000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,14.62300000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,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,3.60890000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48110000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.62300000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,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,3.60890000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48110000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,14.62300000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,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,3.60890000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48110000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.62300000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,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,3.60890000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48110000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,14.62300000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,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,3.60890000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48110000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.62300000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,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,3.98120000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.50590000000,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 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,3.98120000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.50590000000,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 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,3.98120000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.50590000000,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 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,3.98120000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.50590000000,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 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,3.98120000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.50590000000,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 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,3.98120000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.50590000000,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 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.36740000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.53170000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,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,4.36740000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.53170000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,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,4.36740000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.53170000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,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,4.36740000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.53170000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,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,4.36740000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.53170000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,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,4.36740000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.53170000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 81bc21370..f59c669d3 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv @@ -10,48 +10,43 @@ A1,19.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2030 A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2030 A1,11.62600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2035 A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2035 A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2040 A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2040 A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2045 A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2050 A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,7.91410000000,R1,2045,R1,power,solarPV,newcapa,2050 A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index 979575543..9062092d8 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.34640000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62450000000,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.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,2.34640000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62450000000,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.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,2.34640000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62450000000,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.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,2.34640000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62450000000,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.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,2.34640000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62450000000,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.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,2.34640000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62450000000,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.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,2.89960000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43380000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.83290000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.86940000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.89960000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43380000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.83290000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.86940000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.89960000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43380000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.83290000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.86940000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.89960000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43380000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.83290000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.86940000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.89960000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43380000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.83290000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.86940000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.89960000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43380000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.83290000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.86940000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.31360000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46140000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.56210000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.62230000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.31360000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46140000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.56210000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.62230000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.31360000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46140000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.56210000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.62230000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.31360000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46140000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.56210000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.62230000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.31360000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46140000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.56210000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.62230000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.31360000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46140000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.56210000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.62230000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.62360000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48210000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.51490000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.00340000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.62360000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48210000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.51490000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.00340000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.62360000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48210000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.51490000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.00340000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.62360000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48210000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.51490000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.00340000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.62360000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48210000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.51490000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.00340000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.62360000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48210000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.51490000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.00340000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.04280000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.51000000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.73500000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.49140000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.04280000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.51000000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,24.73500000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.49140000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.04280000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.51000000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,24.73500000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.49140000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.04280000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.51000000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,24.73500000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.49140000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.04280000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.51000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.73500000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.49140000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.04280000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.51000000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,24.73500000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.49140000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.35850000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.53110000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,25.57320000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.82670000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.35850000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.53110000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,25.57320000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.82670000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.35850000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.53110000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,25.57320000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,12.82670000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.35850000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.53110000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,25.57320000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.82670000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.35850000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.53110000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,25.57320000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.82670000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.35850000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.53110000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,25.57320000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.82670000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 21090c46b..0e3ff2e19 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv @@ -5,130 +5,73 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025 -A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,7.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2025 -A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,18.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,9.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2030 -A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030 -A1,1.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2030 -A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,10.63440000000,R2,2020,R2,gas,gassupply1,newcapa,2030 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2030 -A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 +A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,24.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025 +A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,30.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,19.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2030 +A1,10.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2030 +A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,23.43330000000,R2,2020,R2,gas,gassupply1,newcapa,2030 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,9.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2035 +A1,10.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2035 A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 -A1,1.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035 -A1,19.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2035 -A1,4.00000000000,R2,2030,R2,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,3.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2035 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2035 -A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2035 +A1,20.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2035 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2035 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 -A1,19.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 -A1,1.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2040 -A1,4.00000000000,R2,2030,R2,power,windturbine,newcapa,2040 -A1,3.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,4.51110000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A1,3.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2040 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2040 -A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2040 -A1,4.51110000000,R2,2035,R2,gas,gassupply1,newcapa,2040 +A1,20.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2040 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2040 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2045 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045 -A1,1.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045 -A1,19.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,20.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2045 -A1,4.00000000000,R2,2030,R2,power,windturbine,newcapa,2045 -A1,3.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2045 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,4.51110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,3.86670000000,R1,2040,R1,gas,gassupply1,newcapa,2045 -A1,3.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2045 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2045 -A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2045 -A1,4.51110000000,R2,2035,R2,gas,gassupply1,newcapa,2045 -A1,3.86670000000,R2,2040,R2,gas,gassupply1,newcapa,2045 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2045 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2050 A1,22.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 -A1,19.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 -A1,1.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,20.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,4.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R2,2030,R2,power,windturbine,newcapa,2050 -A1,3.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2050 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 -A1,4.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,4.51110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,3.86670000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,3.86670000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A1,3.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2050 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2050 -A1,4.51110000000,R2,2035,R2,gas,gassupply1,newcapa,2050 -A1,3.86670000000,R2,2040,R2,gas,gassupply1,newcapa,2050 -A1,3.86670000000,R2,2045,R2,gas,gassupply1,newcapa,2050 +A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2050 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 940f2c7ac..3f6809b3d 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv @@ -47,291 +47,291 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.37740000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,2.37740000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62610000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62610000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,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,2.37740000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,2.37740000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62610000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62610000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,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,2.37740000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,2.37740000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62610000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62610000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,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,2.37740000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,2.37740000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62610000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62610000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,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,2.37740000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,2.37740000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62610000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62610000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,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,2.37740000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,2.37740000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62610000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62610000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.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,2.93060000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,2.93060000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.66110000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.66110000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.29130000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.29130000000,R2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.93060000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,2.93060000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.66110000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.66110000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.29130000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.29130000000,R2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.93060000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,2.93060000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.66110000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.66110000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.29130000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.29130000000,R2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.93060000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,2.93060000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.66110000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.66110000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.29130000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.29130000000,R2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.93060000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,2.93060000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.66110000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.66110000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.29130000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.29130000000,R2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.93060000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,2.93060000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.66110000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.66110000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,15.29130000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,15.29130000000,R2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.47030000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,3.47030000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.90280000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.90280000000,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.41210000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.41210000000,R2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.47030000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,3.47030000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.90280000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.90280000000,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.41210000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.41210000000,R2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.47030000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,3.47030000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.90280000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.90280000000,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.41210000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.41210000000,R2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.47030000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,3.47030000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.90280000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.90280000000,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.41210000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.41210000000,R2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.47030000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,3.47030000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.90280000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.90280000000,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.41210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.41210000000,R2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.47030000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,3.47030000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.90280000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.90280000000,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.41210000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.41210000000,R2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.94520000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,3.94520000000,R2,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,1.19300000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,1.19300000000,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.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,3.94520000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,3.94520000000,R2,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,1.19300000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,1.19300000000,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.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,3.94520000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,3.94520000000,R2,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,1.19300000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,1.19300000000,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.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,3.94520000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,3.94520000000,R2,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,1.19300000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,1.19300000000,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.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,3.94520000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,3.94520000000,R2,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,1.19300000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,1.19300000000,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.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,3.94520000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,3.94520000000,R2,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,1.19300000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,1.19300000000,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.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,4.57430000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,4.57430000000,R2,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,1.55640000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,1.55640000000,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,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,4.57430000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,4.57430000000,R2,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,1.55640000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,1.55640000000,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,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,4.57430000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,4.57430000000,R2,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,1.55640000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,1.55640000000,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,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,4.57430000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,4.57430000000,R2,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,1.55640000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,1.55640000000,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,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,4.57430000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,4.57430000000,R2,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,1.55640000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,1.55640000000,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,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,4.57430000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,4.57430000000,R2,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,1.55640000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,1.55640000000,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,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,5.10000000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,5.10000000000,R2,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,1.93640000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,1.93640000000,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.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,5.10000000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,5.10000000000,R2,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,1.93640000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,1.93640000000,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.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,5.10000000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,5.10000000000,R2,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,1.93640000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,1.93640000000,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.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,5.10000000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,5.10000000000,R2,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,1.93640000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,1.93640000000,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.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,5.10000000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,5.10000000000,R2,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,1.93640000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,1.93640000000,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.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,5.10000000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,5.10000000000,R2,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,1.93640000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,1.93640000000,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.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 7cbe898cd..0a572222b 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -15,56 +15,51 @@ A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,17.07890000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,16.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,16.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,16.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,16.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,32.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index f6e194be6..40c6715d3 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,1.99970000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.60620000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.45130000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.36600000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,0.54490000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,1.99970000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.60620000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,9.99810000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.45130000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.36600000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,0.54490000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,1.99970000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.60620000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,9.99810000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.45130000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.36600000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,0.54490000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,1.99970000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.60620000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,9.99810000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.45130000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.36600000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,0.54490000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,1.99970000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.60620000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,9.99810000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.45130000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.36600000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,0.54490000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,1.99970000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.60620000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,9.99810000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.45130000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.36600000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,0.54490000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,2.51530000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.40820000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,9.99810000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.86950000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.08400000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,0.40820000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,2.51530000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.40820000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,10.08400000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.86950000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.08400000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,0.40820000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,2.51530000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.40820000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,10.08400000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.86950000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.08400000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,0.40820000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,2.51530000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.40820000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,10.08400000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.86950000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.08400000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,0.40820000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,2.51530000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.40820000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,10.08400000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.86950000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.08400000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,0.40820000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,2.51530000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.40820000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,10.08400000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.86950000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.08400000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,0.40820000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,2.76890000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.42510000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,10.08400000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.98000000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,10.58940000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,0.42510000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,2.76890000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.42510000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,10.58940000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.98000000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.58940000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,0.42510000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,2.76890000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.42510000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,10.58940000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.98000000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,10.58940000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,0.42510000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,2.76890000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.42510000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,10.58940000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.98000000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.58940000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,0.42510000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,2.76890000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.42510000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,10.58940000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.98000000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.58940000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,0.42510000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,2.76890000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.42510000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,10.58940000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.98000000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.58940000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,0.42510000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,3.00630000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.44090000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,10.58940000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,20.55170000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.81810000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,0.44090000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,3.00630000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.44090000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,10.81810000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.55170000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,0.44090000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,3.00630000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.44090000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,20.55170000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.81810000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,0.44090000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,3.00630000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.44090000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,10.81810000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.55170000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,0.44090000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,3.00630000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.44090000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,20.55170000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.81810000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,0.44090000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,3.00630000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.44090000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,10.81810000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,20.55170000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.81810000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,0.44090000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,3.29010000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.45980000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,10.81810000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,21.28220000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,11.11030000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,0.45980000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,3.29010000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.45980000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,11.11030000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.28220000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.11030000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,0.45980000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,3.29010000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.45980000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,11.11030000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.28220000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,11.11030000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,0.45980000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,3.29010000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.45980000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,11.11030000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.28220000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.11030000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,0.45980000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,3.29010000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.45980000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,11.11030000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.28220000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.11030000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,0.45980000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,3.29010000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.45980000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,11.11030000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.28220000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.11030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,0.45980000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,3.52320000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.47540000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.11030000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,21.84970000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.33730000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,0.47540000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,3.52320000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.47540000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,11.33730000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,21.84970000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,0.47540000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,3.52320000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.47540000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,21.84970000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.33730000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,0.47540000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,3.52320000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.47540000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,11.33730000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,21.84970000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,0.47540000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,3.52320000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.47540000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,21.84970000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.33730000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,0.47540000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,3.52320000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.47540000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,11.33730000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,21.84970000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.33730000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,0.47540000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.33730000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index a2365f9cf..a86cc709d 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv @@ -23,75 +23,75 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.94810000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.84180000000,R1,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,0.22000000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,1.94810000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.84180000000,R1,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,0.22000000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,1.94810000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.84180000000,R1,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,0.22000000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,1.94810000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.84180000000,R1,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,0.22000000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,1.94810000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.84180000000,R1,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,0.22000000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,1.94810000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.84180000000,R1,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,0.22000000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.29370000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.39340000000,R1,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,0.17000000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.29370000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.39340000000,R1,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,0.17000000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.29370000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.39340000000,R1,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,0.17000000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.29370000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.39340000000,R1,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,0.17000000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.29370000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.39340000000,R1,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,0.17000000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.29370000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.39340000000,R1,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,0.17000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.34640000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.39690000000,R1,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.21000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.34640000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.39690000000,R1,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.21000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,2.34640000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.39690000000,R1,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,0.21000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.34640000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.39690000000,R1,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.21000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.34640000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.39690000000,R1,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.21000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.34640000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.39690000000,R1,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.21000000000,R1,5,MUS$2010/kt,2035 +electricity,all-week,night,all-year,18.15070000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.03660000000,R1,0,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,18.15070000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.03660000000,R1,1,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,18.15070000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.03660000000,R1,2,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,18.15070000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.03660000000,R1,3,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,18.15070000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.03660000000,R1,4,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,18.15070000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.03660000000,R1,5,MUS$2010/PJ,2025 +CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,18.07270000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.76530000000,R1,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,0.12000000000,R1,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,18.07270000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.76530000000,R1,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,0.12000000000,R1,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,18.07270000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.76530000000,R1,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,0.12000000000,R1,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,18.07270000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.76530000000,R1,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,0.12000000000,R1,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,18.07270000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.76530000000,R1,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,0.12000000000,R1,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,18.07270000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,9.76530000000,R1,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,19.37380000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,10.34690000000,R1,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,19.37380000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.34690000000,R1,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,19.37380000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,10.34690000000,R1,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,19.37380000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.34690000000,R1,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,19.37380000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.34690000000,R1,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,19.37380000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.34690000000,R1,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index dd19fb1ea..4407df9bf 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,0.91100000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.56480000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.52500000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.75250000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,0.91100000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.56480000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.52500000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.75250000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,1.03690000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.57970000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,9.41810000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.75250000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,0.91100000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.56480000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.52500000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.75250000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,0.91100000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.56480000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.52500000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.75250000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,0.98680000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.57370000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,9.06240000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.75250000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 307cd8986..bdb9ecbb2 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,0.88040000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.56120000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.03590000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.60570000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,0.88040000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.56120000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.03590000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.60570000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,1.03100000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.57900000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,10.21280000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.60570000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,0.88040000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.56120000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.03590000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.60570000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,0.80810000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.55080000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.25580000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.60570000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,0.80810000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.55080000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.25580000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.60570000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 16162d5a9..90da2b071 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -9,44 +9,39 @@ A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 0b092637d..e6051e7d2 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -31,195 +31,195 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.79230000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.45860000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.66930000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.66180000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,1.79230000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.45860000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.66930000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.66180000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,1.79230000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,0.45860000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,19.66930000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,10.66180000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,1.79230000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.45860000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.66930000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.66180000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,1.79230000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.45860000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.66930000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.66180000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,1.79230000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.45860000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.66930000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.66180000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,1.79230000000,R1,6,MUS$2010/PJ,2025 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,0.45860000000,R1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,19.66930000000,R1,6,MUS$2010/PJ,2025 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,10.66180000000,R1,6,MUS$2010/PJ,2025 CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,1.79230000000,R1,7,MUS$2010/PJ,2025 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,0.45860000000,R1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,19.66930000000,R1,7,MUS$2010/PJ,2025 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,10.66180000000,R1,7,MUS$2010/PJ,2025 CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.21540000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.29110000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.14590000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.55760000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.21540000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.29110000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.14590000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.55760000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,2.21540000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,0.29110000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,20.14590000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,10.55760000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.21540000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.29110000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.14590000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.55760000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.21540000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.29110000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.14590000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.55760000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.21540000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.29110000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.14590000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.55760000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,2.21540000000,R1,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,0.29110000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,20.14590000000,R1,6,MUS$2010/PJ,2030 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,10.55760000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,2.21540000000,R1,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,0.29110000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,20.14590000000,R1,7,MUS$2010/PJ,2030 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,10.55760000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.58250000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.30950000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,21.73500000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.15810000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.58250000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.30950000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,21.73500000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.15810000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,2.58250000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,0.30950000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,21.73500000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,11.15810000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.58250000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.30950000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,21.73500000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.15810000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.58250000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.30950000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,21.73500000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.15810000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.58250000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.30950000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,21.73500000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.15810000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,2.58250000000,R1,6,MUS$2010/PJ,2035 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,0.30950000000,R1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,21.73500000000,R1,6,MUS$2010/PJ,2035 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,11.15810000000,R1,6,MUS$2010/PJ,2035 CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,2.58250000000,R1,7,MUS$2010/PJ,2035 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,0.30950000000,R1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,21.73500000000,R1,7,MUS$2010/PJ,2035 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,11.15810000000,R1,7,MUS$2010/PJ,2035 CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035 -electricity,all-week,night,all-year,2.83670000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.32220000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,22.98980000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,11.68510000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.83670000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.32220000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,22.98980000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.68510000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,2.83670000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,0.32220000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,22.98980000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,11.68510000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.83670000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.32220000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,22.98980000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.68510000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.83670000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.32220000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.98980000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.68510000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.83670000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.32220000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,22.98980000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.68510000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,2.83670000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,0.32220000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,22.98980000000,R1,6,MUS$2010/PJ,2040 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,11.68510000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,2.83670000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,0.32220000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,22.98980000000,R1,7,MUS$2010/PJ,2040 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,11.68510000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 -electricity,all-week,night,all-year,3.22730000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.34170000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.50140000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.26470000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,3.22730000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.34170000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,24.50140000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.26470000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,mid-afternoon,all-year,3.22730000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,0.34170000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,24.50140000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,12.26470000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,3.22730000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.34170000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,24.50140000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.26470000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,3.22730000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.34170000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.50140000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.26470000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,3.22730000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.34170000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,24.50140000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.26470000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,early-morning,all-year,3.22730000000,R1,6,MUS$2010/PJ,2045 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,0.34170000000,R1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,24.50140000000,R1,6,MUS$2010/PJ,2045 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,12.26470000000,R1,6,MUS$2010/PJ,2045 CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045 -electricity,all-week,late-afternoon,all-year,3.22730000000,R1,7,MUS$2010/PJ,2045 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,0.34170000000,R1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,24.50140000000,R1,7,MUS$2010/PJ,2045 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,12.26470000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,3.53820000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.35730000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,25.73530000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.77780000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,3.53820000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.35730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,25.73530000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.77780000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,3.53820000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,0.35730000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,25.73530000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,12.77780000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,3.53820000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.35730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,25.73530000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.77780000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,3.53820000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.35730000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,25.73530000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.77780000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,3.53820000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.35730000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,25.73530000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.77780000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,3.53820000000,R1,6,MUS$2010/PJ,2050 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,0.35730000000,R1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,25.73530000000,R1,6,MUS$2010/PJ,2050 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,12.77780000000,R1,6,MUS$2010/PJ,2050 CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,3.53820000000,R1,7,MUS$2010/PJ,2050 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,0.35730000000,R1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,25.73530000000,R1,7,MUS$2010/PJ,2050 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,12.77780000000,R1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index 6e98fc634..7f8f5eb37 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -44,12 +44,12 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2030 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2030 A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2030 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 @@ -59,14 +59,14 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032 A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2032 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2032 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2032 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2032 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 A1,4.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2032 A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2032 A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2032 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2032 -A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2032 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2032 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2032 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 @@ -76,16 +76,16 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034 A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2034 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2034 -A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2034 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2034 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2034 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 A1,1.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2034 A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2034 A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2034 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2034 -A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2034 -A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2034 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2034 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 @@ -95,16 +95,16 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036 A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2036 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2036 -A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2036 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2036 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2036 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2036 A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2036 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2036 -A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2036 -A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2038 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 @@ -115,10 +115,10 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038 A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2038 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2038 -A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2038 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2038 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2038 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 @@ -130,16 +130,16 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2040 A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2040 A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2040 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 -A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index a15505dcc..df9e17239 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -31,323 +31,323 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.38660000000,R1,0,MUS$2010/PJ,2022 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,0.53220000000,R1,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,16.36400000000,R1,0,MUS$2010/PJ,2022 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,9.59760000000,R1,0,MUS$2010/PJ,2022 CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022 -electricity,all-week,morning,all-year,1.38660000000,R1,1,MUS$2010/PJ,2022 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,0.53220000000,R1,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,16.36400000000,R1,1,MUS$2010/PJ,2022 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,9.59760000000,R1,1,MUS$2010/PJ,2022 CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022 -electricity,all-week,mid-afternoon,all-year,1.38660000000,R1,2,MUS$2010/PJ,2022 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,0.53220000000,R1,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,16.36400000000,R1,2,MUS$2010/PJ,2022 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,9.59760000000,R1,2,MUS$2010/PJ,2022 CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022 -electricity,all-week,early-peak,all-year,1.38660000000,R1,3,MUS$2010/PJ,2022 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,0.53220000000,R1,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,16.36400000000,R1,3,MUS$2010/PJ,2022 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,9.59760000000,R1,3,MUS$2010/PJ,2022 CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022 -electricity,all-week,late-peak,all-year,1.38660000000,R1,4,MUS$2010/PJ,2022 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,0.53220000000,R1,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,16.36400000000,R1,4,MUS$2010/PJ,2022 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,9.59760000000,R1,4,MUS$2010/PJ,2022 CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022 -electricity,all-week,evening,all-year,1.38660000000,R1,5,MUS$2010/PJ,2022 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,0.53220000000,R1,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,16.36400000000,R1,5,MUS$2010/PJ,2022 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,9.59760000000,R1,5,MUS$2010/PJ,2022 CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022 -electricity,all-week,early-morning,all-year,1.38660000000,R1,6,MUS$2010/PJ,2022 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,0.53220000000,R1,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,16.36400000000,R1,6,MUS$2010/PJ,2022 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,9.59760000000,R1,6,MUS$2010/PJ,2022 CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022 -electricity,all-week,late-afternoon,all-year,1.38660000000,R1,7,MUS$2010/PJ,2022 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,0.53220000000,R1,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,16.36400000000,R1,7,MUS$2010/PJ,2022 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,9.59760000000,R1,7,MUS$2010/PJ,2022 CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022 -electricity,all-week,night,all-year,1.54420000000,R1,0,MUS$2010/PJ,2024 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,0.48120000000,R1,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,18.03310000000,R1,0,MUS$2010/PJ,2024 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,10.15040000000,R1,0,MUS$2010/PJ,2024 CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024 -electricity,all-week,morning,all-year,1.54420000000,R1,1,MUS$2010/PJ,2024 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,0.48120000000,R1,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,18.03310000000,R1,1,MUS$2010/PJ,2024 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,10.15040000000,R1,1,MUS$2010/PJ,2024 CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024 -electricity,all-week,mid-afternoon,all-year,1.54420000000,R1,2,MUS$2010/PJ,2024 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,0.48120000000,R1,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,18.03310000000,R1,2,MUS$2010/PJ,2024 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,10.15040000000,R1,2,MUS$2010/PJ,2024 CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024 -electricity,all-week,early-peak,all-year,1.54420000000,R1,3,MUS$2010/PJ,2024 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,0.48120000000,R1,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,18.03310000000,R1,3,MUS$2010/PJ,2024 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,10.15040000000,R1,3,MUS$2010/PJ,2024 CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024 -electricity,all-week,late-peak,all-year,1.54420000000,R1,4,MUS$2010/PJ,2024 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,0.48120000000,R1,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,18.03310000000,R1,4,MUS$2010/PJ,2024 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,10.15040000000,R1,4,MUS$2010/PJ,2024 CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024 -electricity,all-week,evening,all-year,1.54420000000,R1,5,MUS$2010/PJ,2024 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,0.48120000000,R1,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,18.03310000000,R1,5,MUS$2010/PJ,2024 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,10.15040000000,R1,5,MUS$2010/PJ,2024 CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024 -electricity,all-week,early-morning,all-year,1.54420000000,R1,6,MUS$2010/PJ,2024 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,0.48120000000,R1,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,18.03310000000,R1,6,MUS$2010/PJ,2024 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,10.15040000000,R1,6,MUS$2010/PJ,2024 CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024 -electricity,all-week,late-afternoon,all-year,1.54420000000,R1,7,MUS$2010/PJ,2024 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,0.48120000000,R1,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,18.03310000000,R1,7,MUS$2010/PJ,2024 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,10.15040000000,R1,7,MUS$2010/PJ,2024 CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024 -electricity,all-week,night,all-year,1.68400000000,R1,0,MUS$2010/PJ,2026 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,0.42020000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,18.50630000000,R1,0,MUS$2010/PJ,2026 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,10.27560000000,R1,0,MUS$2010/PJ,2026 CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026 -electricity,all-week,morning,all-year,1.68400000000,R1,1,MUS$2010/PJ,2026 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,0.42020000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,18.50630000000,R1,1,MUS$2010/PJ,2026 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,10.27560000000,R1,1,MUS$2010/PJ,2026 CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026 -electricity,all-week,mid-afternoon,all-year,1.68400000000,R1,2,MUS$2010/PJ,2026 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,0.42020000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,18.50630000000,R1,2,MUS$2010/PJ,2026 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,10.27560000000,R1,2,MUS$2010/PJ,2026 CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026 -electricity,all-week,early-peak,all-year,1.68400000000,R1,3,MUS$2010/PJ,2026 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,0.42020000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,18.50630000000,R1,3,MUS$2010/PJ,2026 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,10.27560000000,R1,3,MUS$2010/PJ,2026 CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026 -electricity,all-week,late-peak,all-year,1.68400000000,R1,4,MUS$2010/PJ,2026 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,0.42020000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,18.50630000000,R1,4,MUS$2010/PJ,2026 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,10.27560000000,R1,4,MUS$2010/PJ,2026 CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026 -electricity,all-week,evening,all-year,1.68400000000,R1,5,MUS$2010/PJ,2026 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,0.42020000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,18.50630000000,R1,5,MUS$2010/PJ,2026 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,10.27560000000,R1,5,MUS$2010/PJ,2026 CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026 -electricity,all-week,early-morning,all-year,1.68400000000,R1,6,MUS$2010/PJ,2026 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,0.42020000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,18.50630000000,R1,6,MUS$2010/PJ,2026 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,10.27560000000,R1,6,MUS$2010/PJ,2026 CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026 -electricity,all-week,late-afternoon,all-year,1.68400000000,R1,7,MUS$2010/PJ,2026 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,0.42020000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,18.50630000000,R1,7,MUS$2010/PJ,2026 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,10.27560000000,R1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026 -electricity,all-week,night,all-year,1.85430000000,R1,0,MUS$2010/PJ,2028 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,0.35360000000,R1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,20.12490000000,R1,0,MUS$2010/PJ,2028 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,10.70840000000,R1,0,MUS$2010/PJ,2028 CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028 -electricity,all-week,morning,all-year,1.85430000000,R1,1,MUS$2010/PJ,2028 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,0.35360000000,R1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,20.12490000000,R1,1,MUS$2010/PJ,2028 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,10.70840000000,R1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,1.85430000000,R1,2,MUS$2010/PJ,2028 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,0.35360000000,R1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,20.12490000000,R1,2,MUS$2010/PJ,2028 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,10.70840000000,R1,2,MUS$2010/PJ,2028 CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028 -electricity,all-week,early-peak,all-year,1.85430000000,R1,3,MUS$2010/PJ,2028 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,0.35360000000,R1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,20.12490000000,R1,3,MUS$2010/PJ,2028 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,10.70840000000,R1,3,MUS$2010/PJ,2028 CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028 -electricity,all-week,late-peak,all-year,1.85430000000,R1,4,MUS$2010/PJ,2028 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,0.35360000000,R1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,20.12490000000,R1,4,MUS$2010/PJ,2028 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,10.70840000000,R1,4,MUS$2010/PJ,2028 CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028 -electricity,all-week,evening,all-year,1.85430000000,R1,5,MUS$2010/PJ,2028 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,0.35360000000,R1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,20.12490000000,R1,5,MUS$2010/PJ,2028 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,10.70840000000,R1,5,MUS$2010/PJ,2028 CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028 -electricity,all-week,early-morning,all-year,1.85430000000,R1,6,MUS$2010/PJ,2028 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,0.35360000000,R1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,20.12490000000,R1,6,MUS$2010/PJ,2028 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,10.70840000000,R1,6,MUS$2010/PJ,2028 CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028 -electricity,all-week,late-afternoon,all-year,1.85430000000,R1,7,MUS$2010/PJ,2028 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,0.35360000000,R1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,20.12490000000,R1,7,MUS$2010/PJ,2028 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,10.70840000000,R1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,2.03990000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.28240000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.54700000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.71800000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.03990000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.28240000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.54700000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.71800000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,2.03990000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,0.28240000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,20.54700000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,10.71800000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.03990000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.28240000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.54700000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.71800000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.03990000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.28240000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.54700000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.71800000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.03990000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.28240000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.54700000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.71800000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,2.03990000000,R1,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,0.28240000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,20.54700000000,R1,6,MUS$2010/PJ,2030 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,10.71800000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,2.03990000000,R1,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,0.28240000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,20.54700000000,R1,7,MUS$2010/PJ,2030 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,10.71800000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.27390000000,R1,0,MUS$2010/PJ,2032 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,0.29410000000,R1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,21.52420000000,R1,0,MUS$2010/PJ,2032 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,11.09330000000,R1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,2.27390000000,R1,1,MUS$2010/PJ,2032 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,0.29410000000,R1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,21.52420000000,R1,1,MUS$2010/PJ,2032 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,11.09330000000,R1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,2.27390000000,R1,2,MUS$2010/PJ,2032 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,0.29410000000,R1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,21.52420000000,R1,2,MUS$2010/PJ,2032 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,11.09330000000,R1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,2.27390000000,R1,3,MUS$2010/PJ,2032 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,0.29410000000,R1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,21.52420000000,R1,3,MUS$2010/PJ,2032 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,11.09330000000,R1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,2.27390000000,R1,4,MUS$2010/PJ,2032 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,0.29410000000,R1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,21.52420000000,R1,4,MUS$2010/PJ,2032 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,11.09330000000,R1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,2.27390000000,R1,5,MUS$2010/PJ,2032 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,0.29410000000,R1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,21.52420000000,R1,5,MUS$2010/PJ,2032 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,11.09330000000,R1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,2.27390000000,R1,6,MUS$2010/PJ,2032 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,0.29410000000,R1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,21.52420000000,R1,6,MUS$2010/PJ,2032 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,11.09330000000,R1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,2.27390000000,R1,7,MUS$2010/PJ,2032 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,0.29410000000,R1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,21.52420000000,R1,7,MUS$2010/PJ,2032 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,11.09330000000,R1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,2.51230000000,R1,0,MUS$2010/PJ,2034 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,0.30600000000,R1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,22.24330000000,R1,0,MUS$2010/PJ,2034 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,11.36750000000,R1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,2.51230000000,R1,1,MUS$2010/PJ,2034 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,0.30600000000,R1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,22.24330000000,R1,1,MUS$2010/PJ,2034 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,11.36750000000,R1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,2.51230000000,R1,2,MUS$2010/PJ,2034 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,0.30600000000,R1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,22.24330000000,R1,2,MUS$2010/PJ,2034 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,11.36750000000,R1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,2.51230000000,R1,3,MUS$2010/PJ,2034 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,0.30600000000,R1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,22.24330000000,R1,3,MUS$2010/PJ,2034 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,11.36750000000,R1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,2.51230000000,R1,4,MUS$2010/PJ,2034 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,0.30600000000,R1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,22.24330000000,R1,4,MUS$2010/PJ,2034 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,11.36750000000,R1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,2.51230000000,R1,5,MUS$2010/PJ,2034 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,0.30600000000,R1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,22.24330000000,R1,5,MUS$2010/PJ,2034 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,11.36750000000,R1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,2.51230000000,R1,6,MUS$2010/PJ,2034 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,0.30600000000,R1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,22.24330000000,R1,6,MUS$2010/PJ,2034 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,11.36750000000,R1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,2.51230000000,R1,7,MUS$2010/PJ,2034 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,0.30600000000,R1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,22.24330000000,R1,7,MUS$2010/PJ,2034 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,11.36750000000,R1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,2.64870000000,R1,0,MUS$2010/PJ,2036 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,0.31280000000,R1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,22.87420000000,R1,0,MUS$2010/PJ,2036 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,11.60810000000,R1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,2.64870000000,R1,1,MUS$2010/PJ,2036 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,0.31280000000,R1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,22.87420000000,R1,1,MUS$2010/PJ,2036 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,11.60810000000,R1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,2.64870000000,R1,2,MUS$2010/PJ,2036 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,0.31280000000,R1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,22.87420000000,R1,2,MUS$2010/PJ,2036 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,11.60810000000,R1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,2.64870000000,R1,3,MUS$2010/PJ,2036 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,0.31280000000,R1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,22.87420000000,R1,3,MUS$2010/PJ,2036 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,11.60810000000,R1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,2.64870000000,R1,4,MUS$2010/PJ,2036 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,0.31280000000,R1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,22.87420000000,R1,4,MUS$2010/PJ,2036 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,11.60810000000,R1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,2.64870000000,R1,5,MUS$2010/PJ,2036 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,0.31280000000,R1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,22.87420000000,R1,5,MUS$2010/PJ,2036 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,11.60810000000,R1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,2.64870000000,R1,6,MUS$2010/PJ,2036 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,0.31280000000,R1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,22.87420000000,R1,6,MUS$2010/PJ,2036 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,11.60810000000,R1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,2.64870000000,R1,7,MUS$2010/PJ,2036 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,0.31280000000,R1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,22.87420000000,R1,7,MUS$2010/PJ,2036 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,11.60810000000,R1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036 -electricity,all-week,night,all-year,2.76990000000,R1,0,MUS$2010/PJ,2038 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,0.31890000000,R1,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,23.43220000000,R1,0,MUS$2010/PJ,2038 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,11.82100000000,R1,0,MUS$2010/PJ,2038 CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038 -electricity,all-week,morning,all-year,2.76990000000,R1,1,MUS$2010/PJ,2038 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,0.31890000000,R1,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,23.43220000000,R1,1,MUS$2010/PJ,2038 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,11.82100000000,R1,1,MUS$2010/PJ,2038 CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038 -electricity,all-week,mid-afternoon,all-year,2.76990000000,R1,2,MUS$2010/PJ,2038 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,0.31890000000,R1,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,23.43220000000,R1,2,MUS$2010/PJ,2038 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,11.82100000000,R1,2,MUS$2010/PJ,2038 CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038 -electricity,all-week,early-peak,all-year,2.76990000000,R1,3,MUS$2010/PJ,2038 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,0.31890000000,R1,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,23.43220000000,R1,3,MUS$2010/PJ,2038 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,11.82100000000,R1,3,MUS$2010/PJ,2038 CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038 -electricity,all-week,late-peak,all-year,2.76990000000,R1,4,MUS$2010/PJ,2038 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,0.31890000000,R1,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,23.43220000000,R1,4,MUS$2010/PJ,2038 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,11.82100000000,R1,4,MUS$2010/PJ,2038 CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038 -electricity,all-week,evening,all-year,2.76990000000,R1,5,MUS$2010/PJ,2038 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,0.31890000000,R1,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,23.43220000000,R1,5,MUS$2010/PJ,2038 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,11.82100000000,R1,5,MUS$2010/PJ,2038 CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038 -electricity,all-week,early-morning,all-year,2.76990000000,R1,6,MUS$2010/PJ,2038 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,0.31890000000,R1,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,23.43220000000,R1,6,MUS$2010/PJ,2038 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,11.82100000000,R1,6,MUS$2010/PJ,2038 CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038 -electricity,all-week,late-afternoon,all-year,2.76990000000,R1,7,MUS$2010/PJ,2038 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,0.31890000000,R1,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,23.43220000000,R1,7,MUS$2010/PJ,2038 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,11.82100000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,2.87840000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.32430000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.99230000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.08610000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.87840000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.32430000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.99230000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.08610000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,2.87840000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,0.32430000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,23.99230000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.08610000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.87840000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.32430000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.99230000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.08610000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.87840000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.32430000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.99230000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.08610000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.87840000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.32430000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.99230000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.08610000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,2.87840000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,0.32430000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,23.99230000000,R1,6,MUS$2010/PJ,2040 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.08610000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,2.87840000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,0.32430000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,23.99230000000,R1,7,MUS$2010/PJ,2040 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.08610000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 8ec81b808..99af66bd7 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -11,49 +11,49 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,1.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,1.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,1.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.67000000000,R1,2030,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 a5b7327d1..6582dda8b 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.69560000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.59020000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.05040000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.60580000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,1.69560000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.59020000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.05040000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.60580000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,1.69560000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.59020000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.05040000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.60580000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,1.69560000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.59020000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.05040000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.60580000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,1.69560000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.59020000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.05040000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.60580000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,1.69560000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.59020000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.05040000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.60580000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,1.96770000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.37170000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,15.61770000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.78330000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,1.96770000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.37170000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,15.61770000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.78330000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,1.96770000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.37170000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,15.61770000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.78330000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,1.96770000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.37170000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,15.61770000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.78330000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,1.96770000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.37170000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,15.61770000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,8.78330000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,1.96770000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.37170000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.61770000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.78330000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.02470000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.37550000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,16.08280000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.03050000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.02470000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.37550000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.08280000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.03050000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,2.02470000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.37550000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,16.08280000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.03050000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.02470000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.37550000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.08280000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.03050000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.02470000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.37550000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,16.08280000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.03050000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.02470000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.37550000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,16.08280000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.03050000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,2.12170000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.38190000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.19560000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.07570000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.12170000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.38190000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.19560000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.07570000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,2.12170000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.38190000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.19560000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.07570000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.12170000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.38190000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.19560000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.07570000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.12170000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.38190000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.19560000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.07570000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.12170000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.38190000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.19560000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.07570000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,2.26120000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.39120000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.38170000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.15010000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,2.26120000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.39120000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.38170000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.15010000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,2.26120000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.39120000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.38170000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.15010000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,2.26120000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.39120000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.38170000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.15010000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,2.26120000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.39120000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.38170000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.15010000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,2.26120000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.39120000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.38170000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.15010000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,2.43020000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.40250000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,16.87480000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.34730000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,2.43020000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.40250000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,16.87480000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.34730000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,2.43020000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.40250000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,16.87480000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.34730000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,2.43020000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.40250000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,16.87480000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.34730000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,2.43020000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.40250000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,16.87480000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.34730000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,2.43020000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.40250000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.87480000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.34730000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/src/muse/costs.py b/src/muse/costs.py index 4461113eb..25d6cc693 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -1,33 +1,229 @@ """Collection of functions for calculating cost metrics (e.g. LCOE, EAC). -In general, these functions take a Dataset of technology parameters, and return a -DataArray of the calculated cost for each technology. Functions may also take additional -data such as commodity prices, capacity of the technologies, and commodity-production -data for the technologies, where appropriate. +All costs functions take a subset of the following arguments: +- technologies: xr.Dataset of technology parameters +- prices: xr.DataArray with commodity prices +- capacity: xr.DataArray with the capacity of the technologies +- production: xr.DataArray with commodity production by the technologies +- consumption: xr.DataArray with commodity consumption by the technologies +- method: "lifetime" or "annual" + +Data should only be provided for a single year (i.e. no "year" dimension in any of the +inputs). Prices, production and consumption data should be split across timeslices +(i.e. have a "timeslice" dimension). Technology parameters may also be specified at +the timeslice level, but capacity should not be. + +The `technologies` input will usually contain data for multiple technologies and have +a "technology" dimension (sometimes called "asset" or "replacement"). In this case, +it's important that the `capacity`, `production`, and `consumption` inputs have a +similar dimension to ensure that costs are calculated for all technologies and to +prevent unwanted broadcasting. + +Additional dimensions (such as "region") may be present in the inputs, but it's up to +the parent functions to ensure that these are consistent between inputs to prevent +unwanted broadcasting. + +Some costs are calculated at the timeslice level (e.g. fuel costs), while others are +calculated for the year/lifetime as a whole (e.g. capital costs, LCOE). Refer to the +individual function docstrings for more details. + +Some functions have a `method` argument, which can be "annual" or "lifetime": + +Costs can either be annual or lifetime: +- annual: calculates the cost in a single year +- lifetime: calculates the total cost over the lifetime of the + technology, using the `technical_life` attribute from the `technologies` dataset. + - In this case, technology parameters, production, consumption, capacity and prices + are assumed to be constant over the lifetime of the technology. The cost in each + year is discounted according to the `interest_rate` attribute from the + `technologies` dataset, and summed across years. + - Capital costs are different, as these are a one time cost for the lifetime of the + technology. This can be annualized by dividing by the `technical_life`. +Some functions can calculate both lifetime and annual costs, with a `method` argument +to specify. Others can only calculate one or the other (see individual function +docstrings for more details). + """ -from typing import Optional, Union +from __future__ import annotations + +from functools import wraps import numpy as np import xarray as xr from muse.commodities import is_enduse, is_fuel, is_material, is_pollutant -from muse.quantities import consumption -from muse.timeslices import broadcast_timeslice, distribute_timeslice +from muse.quantities import production_amplitude from muse.utilities import filter_input +def cost(func): + """Decorator to validate the output dimensions of the cost functions.""" + + @wraps(func) + def wrapper(*args, **kwargs): + result = func(*args, **kwargs) + assert "year" not in result.dims + return result + + return wrapper + + +@cost +def capital_costs( + technologies: xr.Dataset, + capacity: xr.DataArray, + method: str = "lifetime", +): + """Calculate capital costs for the relevant technologies. + + This is the cost of installing each technology to the level specified by the + `capacity` input. + + Method can be "lifetime" or "annual": + - lifetime: returns the full capital costs + - annual: total capital costs are multiplied by the capital recovery factor to get + annualized costs + """ + if method not in ["lifetime", "annual"]: + raise ValueError("method must be either 'lifetime' or 'annual'.") + + _capital_costs = technologies.cap_par * (capacity**technologies.cap_exp) + if method == "annual": + crf = capital_recovery_factor(technologies) + _capital_costs = _capital_costs * crf + assert "timeslice" not in _capital_costs.dims + return _capital_costs + + +@cost +def environmental_costs( + technologies: xr.Dataset, prices: xr.DataArray, production: xr.DataArray +) -> xr.DataArray: + """Calculate timeslice-level environmental costs for the relevant technologies. + + This is the total production of pollutants (commodities flagged by `is_pollutant`) + multiplied by their prices. + """ + environmentals = is_pollutant(technologies.comm_usage) + prices_environmental = filter_input(prices, commodity=environmentals) + result = (production * prices_environmental).sum("commodity") + assert "timeslice" in result.dims + return result + + +@cost +def fuel_costs( + technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray +) -> xr.DataArray: + """Calculate timeslice-level fuel costs for the relevant technologies. + + This is the total consumption of fuels (commodities flagged by `is_fuel`) + multiplied by their prices. + """ + fuels = is_fuel(technologies.comm_usage) + prices_fuel = filter_input(prices, commodity=fuels) + result = (consumption * prices_fuel).sum("commodity") + assert "timeslice" in result.dims + return result + + +@cost +def material_costs( + technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray +) -> xr.DataArray: + """Calculate timeslice-level material costs for the relevant technologies. + + This is the total consumption of materials (commodities flagged by `is_material`) + multiplied by their prices. + """ + material = is_material(technologies.comm_usage) + prices_material = filter_input(prices, commodity=material) + result = (consumption * prices_material).sum("commodity") + assert "timeslice" in result.dims + return result + + +@cost +def fixed_costs(technologies: xr.Dataset, capacity: xr.DataArray) -> xr.DataArray: + """Calculate annual fixed costs for the relevant technologies. + + This is the fixed running cost over the course of a year corresponding to the + `fix_par` and `fix_exp` technology parameters. + """ + result = technologies.fix_par * (capacity**technologies.fix_exp) + assert "timeslice" not in result.dims + return result + + +@cost +def variable_costs( + technologies: xr.Dataset, + production: xr.DataArray, +) -> xr.DataArray: + """Calculate annual variable costs for the relevant technologies. + + This is the cost associated with the `var_par` and `var_exp` technology + parameters. + + The `production_amplitude` function is first used to calculate technology activity + in each timeslice based on `production`. This is then used to scale the variable + costs. + """ + tech_activity = production_amplitude(production, technologies).sum("timeslice") + result = technologies.var_par * tech_activity**technologies.var_exp + assert "timeslice" not in result.dims + return result + + +@cost +def running_costs( + technologies: xr.Dataset, + prices: xr.DataArray, + capacity: xr.DataArray, + production: xr.DataArray, + consumption: xr.DataArray, +) -> xr.DataArray: + """Total annual running costs (excluding capital costs). + + This is the sum of environmental, fuel, material, fixed and variable costs. + + .. seealso:: + :py:func:`environmental_costs` + :py:func:`fuel_costs` + :py:func:`material_costs` + :py:func:`fixed_costs` + :py:func:`variable_costs` + """ + _environmental_costs = environmental_costs(technologies, prices, production) + _fuel_costs = fuel_costs(technologies, prices, consumption) + _material_costs = material_costs(technologies, prices, consumption) + _fixed_costs = fixed_costs(technologies, capacity) + _variable_costs = variable_costs(technologies, production) + + # Total running costs + result = ( + _environmental_costs.sum("timeslice") + + _fuel_costs.sum("timeslice") + + _material_costs.sum("timeslice") + + _fixed_costs + + _variable_costs + ) + assert "timeslice" not in result.dims + return result + + +@cost def net_present_value( technologies: xr.Dataset, prices: xr.DataArray, capacity: xr.DataArray, production: xr.DataArray, - year: int, - timeslice_level: Optional[str] = None, + consumption: xr.DataArray, ) -> xr.DataArray: """Net present value (NPV) of the relevant technologies. - The net present value of a technology is the present value of all the revenues that + The net present value of a technology is the present value of all the revenues that a technology earns over its lifetime minus all the costs of installing and operating it. Follows the definition of the `net present cost`_ given by HOMER Energy. .. _net present cost: @@ -40,130 +236,51 @@ def net_present_value( installed capacity and production (non-environmental), respectively - capacity costs are given as technodata inputs and depend on the installed capacity - Note: - Here, the installation year is always agent.forecast_year, - since objectives compute the - NPV for technologies to be installed in the current year. A more general NPV - computation would have to refer to installation year of the technology. + .. seealso:: + :py:func:`capital_costs` + :py:func:`running_costs` Arguments: technologies: xr.Dataset of technology parameters prices: xr.DataArray with commodity prices capacity: xr.DataArray with the capacity of the relevant technologies - production: xr.DataArray with the production of the relevant technologies - year: int, the year of the forecast - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") + production: xr.DataArray with commodity production by the relevant technologies + consumption: xr.DataArray with commodity consumption by the relevant + technologies Return: xr.DataArray with the NPV calculated for the relevant technologies """ - # Filtering of the inputs - techs = technologies[ - [ - "technical_life", - "interest_rate", - "cap_par", - "cap_exp", - "var_par", - "var_exp", - "fix_par", - "fix_exp", - "fixed_outputs", - "fixed_inputs", - "flexible_inputs", - "utilization_factor", - ] - ] - - # Years - life = techs.technical_life.astype(int) - iyears = range(year, max(year + life.values.max(), year + 1)) - years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") - - # Evolution of rates with time - rates = broadcast_timeslice( - discount_factor( - years - year + 1, - interest_rate=techs.interest_rate, - mask=years <= year + life, - ), - level=timeslice_level, - ) + # Capital costs (lifetime) + _capital_costs = capital_costs(technologies, capacity, method="lifetime") - # Filters - environmentals = is_pollutant(technologies.comm_usage) - material = is_material(technologies.comm_usage) + # Revenue (annual) products = is_enduse(technologies.comm_usage) - fuels = is_fuel(technologies.comm_usage) + prices_non_env = filter_input(prices, commodity=products) + revenues = (production * prices_non_env).sum(["commodity", "timeslice"]) - # Calculate consumption - cons = consumption(technologies=techs, production=production, prices=prices) - - # Revenue - prices_non_env = filter_input(prices, commodity=products, year=years.values) - raw_revenues = (production * prices_non_env * rates).sum(("commodity", "year")) - - # Cost of installed capacity - installed_capacity_costs = distribute_timeslice( - techs.cap_par * (capacity**techs.cap_exp), level=timeslice_level - ) - - # Cost related to environmental products - prices_environmental = filter_input( - prices, commodity=environmentals, year=years.values - ) - environmental_costs = (production * prices_environmental * rates).sum( - ("commodity", "year") + # Running costs (annual) + _running_costs = running_costs( + technologies, prices, capacity, production, consumption ) - # Fuel/energy costs - prices_fuel = filter_input(prices, commodity=fuels, year=years.values) - fuel_costs = (cons * prices_fuel * rates).sum(("commodity", "year")) - - # Cost related to material other than fuel/energy and environmentals - prices_material = filter_input(prices, commodity=material, year=years.values) - material_costs = (cons * prices_material * rates).sum(("commodity", "year")) - - # Fixed costs - fixed_costs = ( - distribute_timeslice( - techs.fix_par * (capacity**techs.fix_exp), level=timeslice_level - ) - * rates - ).sum("year") - - # Variable costs - tech_activity = ( - production.sel(commodity=products) - / broadcast_timeslice(techs.fixed_outputs, level=timeslice_level) - ).max("commodity") - variable_costs = ( - ( - broadcast_timeslice(techs.var_par, level=timeslice_level) - * tech_activity ** broadcast_timeslice(techs.var_exp, level=timeslice_level) - ) - * rates - ).sum("year") + # Calculate running costs and revenues over lifetime + _running_costs = annual_to_lifetime(_running_costs, technologies) + revenues = annual_to_lifetime(revenues, technologies) # Net present value - result = raw_revenues - ( - installed_capacity_costs - + fuel_costs - + environmental_costs - + material_costs - + fixed_costs - + variable_costs - ) - + result = revenues - (_capital_costs + _running_costs) + assert "timeslice" not in result.dims return result +@cost def net_present_cost( technologies: xr.Dataset, prices: xr.DataArray, capacity: xr.DataArray, production: xr.DataArray, - year: int, + consumption: xr.DataArray, ) -> xr.DataArray: """Net present cost (NPC) of the relevant technologies. @@ -178,22 +295,25 @@ def net_present_cost( technologies: xr.Dataset of technology parameters prices: xr.DataArray with commodity prices capacity: xr.DataArray with the capacity of the relevant technologies - production: xr.DataArray with the production of the relevant technologies - year: int, the year of the forecast + production: xr.DataArray with commodity production by the relevant technologies + consumption: xr.DataArray with commodity consumption by the relevant + technologies Return: xr.DataArray with the NPC calculated for the relevant technologies """ - return -net_present_value(technologies, prices, capacity, production, year) + result = -net_present_value(technologies, prices, capacity, production, consumption) + assert "timeslice" not in result.dims + return result +@cost def equivalent_annual_cost( technologies: xr.Dataset, prices: xr.DataArray, capacity: xr.DataArray, production: xr.DataArray, - year: int, - timeslice_level: Optional[str] = None, + consumption: xr.DataArray, ) -> xr.DataArray: """Equivalent annual costs (or annualized cost) of a technology. @@ -205,259 +325,109 @@ def equivalent_annual_cost( .. _annualized cost: https://www.homerenergy.com/products/pro/docs/3.15/annualized_cost.html + .. seealso:: + :py:func:`net_present_cost` + Arguments: technologies: xr.Dataset of technology parameters prices: xr.DataArray with commodity prices capacity: xr.DataArray with the capacity of the relevant technologies - production: xr.DataArray with the production of the relevant technologies - year: int, the year of the forecast - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") + production: xr.DataArray with commodity production by the relevant technologies + consumption: xr.DataArray with commodity consumption by the relevant + technologies Return: xr.DataArray with the EAC calculated for the relevant technologies """ - npc = net_present_cost(technologies, prices, capacity, production, year) + npc = net_present_cost( + technologies, + prices, + capacity, + production, + consumption, + ) crf = capital_recovery_factor(technologies) - return npc * broadcast_timeslice(crf, level=timeslice_level) + result = npc * crf + assert "timeslice" not in result.dims + return result -def lifetime_levelized_cost_of_energy( +@cost +def levelized_cost_of_energy( technologies: xr.Dataset, prices: xr.DataArray, capacity: xr.DataArray, production: xr.DataArray, - year: int, - timeslice_level: Optional[str] = None, + consumption: xr.DataArray, + method: str = "lifetime", ) -> xr.DataArray: """Levelized cost of energy (LCOE) of technologies over their lifetime. It follows the `simplified LCOE` given by NREL. + .. seealso:: + :py:func:`capital_costs` + :py:func:`running_costs` + + Can calculate either a lifetime or annual LCOE. + - lifetime: the average cost per unit of production over the entire lifetime of the + technology. + Annual running costs and production are calculated for the full lifetime of the + technology, and adjusted to a present value using the discount rate. Total + costs (running costs over the lifetime + initial capital costs) are then divided + by total production to get the average cost per unit of production. + - annual: the average cost per unit of production in a single year. + Annual running costs and production are calculated for a single year. Capital + costs are multiplied by the capital recovery factor to get an annualized cost. + Total costs (annualized capital costs + running costs) are then divided by + production to get the average cost per unit of production. + Arguments: technologies: xr.Dataset of technology parameters prices: xr.DataArray with commodity prices capacity: xr.DataArray with the capacity of the relevant technologies - production: xr.DataArray with the production of the relevant technologies - year: int, the year of the forecast - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") + production: xr.DataArray with commodity production by the relevant technologies + consumption: xr.DataArray with commodity consumption by the relevant + technologies + method: "lifetime" or "annual" Return: xr.DataArray with the LCOE calculated for the relevant technologies """ - techs = technologies[ - [ - "technical_life", - "interest_rate", - "cap_par", - "cap_exp", - "var_par", - "var_exp", - "fix_par", - "fix_exp", - "fixed_outputs", - "fixed_inputs", - "flexible_inputs", - "utilization_factor", - ] - ] - - # Years - life = techs.technical_life.astype(int) - iyears = range(year, max(year + life.values.max(), year)) - years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") - - # Evolution of rates with time - rates = broadcast_timeslice( - discount_factor( - years=years - year + 1, - interest_rate=techs.interest_rate, - mask=years <= year + life, - ), - level=timeslice_level, - ) - - # Filters - environmentals = is_pollutant(technologies.comm_usage) - material = is_material(technologies.comm_usage) - products = is_enduse(technologies.comm_usage) - fuels = is_fuel(technologies.comm_usage) + if method not in ["lifetime", "annual"]: + raise ValueError("method must be either 'lifetime' or 'annual'.") - # Calculate consumption - cons = consumption( - technologies=techs, - production=production, - prices=prices, - timeslice_level=timeslice_level, - ) + # Capital costs (lifetime or annual depending on method) + _capital_costs = capital_costs(technologies, capacity, method) - # Cost of installed capacity - installed_capacity_costs = distribute_timeslice( - techs.cap_par * (capacity**techs.cap_exp), level=timeslice_level + # Running costs (annual) + _running_costs = running_costs( + technologies, prices, capacity, production, consumption ) - # Cost related to environmental products - prices_environmental = filter_input( - prices, commodity=environmentals, year=years.values - ) - environmental_costs = (production * prices_environmental * rates).sum( - ("commodity", "year") - ) - - # Fuel/energy costs - prices_fuel = filter_input(prices, commodity=fuels, year=years.values) - fuel_costs = (cons * prices_fuel * rates).sum(("commodity", "year")) - - # Cost related to material other than fuel/energy and environmentals - prices_material = filter_input(prices, commodity=material, year=years.values) - material_costs = (cons * prices_material * rates).sum(("commodity", "year")) - - # Fixed costs - fixed_costs = ( - distribute_timeslice( - techs.fix_par * (capacity**techs.fix_exp), level=timeslice_level - ) - * rates - ).sum("year") - - # Variable costs - tech_activity = ( - production.sel(commodity=products) - / broadcast_timeslice(techs.fixed_outputs, level=timeslice_level) - ).max("commodity") - variable_costs = ( - ( - broadcast_timeslice(techs.var_par, level=timeslice_level) - * tech_activity ** broadcast_timeslice(techs.var_exp, level=timeslice_level) - ) - * rates - ).sum("year") - - # Production + # Production (annual) + products = is_enduse(technologies.comm_usage) prod = ( production.where(production > 0.0, 1e-6) .sel(commodity=products) - .sum("commodity") + .sum( + ["commodity", "timeslice"] + ) # TODO: is this the correct way to deal with multiple products? ) - total_prod = (prod * rates).sum("year") - # LCOE - result = ( - installed_capacity_costs - + fuel_costs - + environmental_costs - + material_costs - + fixed_costs - + variable_costs - ) / total_prod + # If method is lifetime, have to adjust running costs and production + if method == "lifetime": + _running_costs = annual_to_lifetime(_running_costs, technologies) + prod = annual_to_lifetime(prod, technologies) + # LCOE + result = (_capital_costs + _running_costs) / prod + assert "timeslice" not in result.dims return result -def annual_levelized_cost_of_energy( - technologies: xr.Dataset, - prices: xr.DataArray, - interpolation: str = "linear", - fill_value: Union[int, str] = "extrapolate", - timeslice_level: Optional[str] = None, - **filters, -) -> xr.DataArray: - """Undiscounted levelized cost of energy (LCOE) of technologies on each given year. - - It mostly follows the `simplified LCOE`_ given by NREL. In the argument description, - we use the following: - - * [h]: hour - * [y]: year - * [$]: unit of currency - * [E]: unit of energy - * [1]: dimensionless - - Arguments: - technologies: Describe the technologies, with at least the following parameters: - * cap_par: [$/E] overnight capital cost - * interest_rate: [1] - * fix_par: [$/(Eh)] fixed costs of operation and maintenance costs - * var_par: [$/(Eh)] variable costs of operation and maintenance costs - * fixed_inputs: [1] == [(Eh)/(Eh)] ratio indicating the amount of commodity - consumed per units of energy created. - * fixed_outputs: [1] == [(Eh)/(Eh)] ration indicating the amount of - environmental pollutants produced per units of energy created. - prices: [$/(Eh)] the price of all commodities, including consumables and fuels. - This dataarray contains at least timeslice and commodity dimensions. - interpolation: interpolation method. - fill_value: Fill value for values outside the extrapolation range. - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") - **filters: Anything by which prices can be filtered. - - Return: - The lifetime LCOE in [$/(Eh)] for each technology at each timeslice. - - .. _simplified LCOE: https://www.nrel.gov/analysis/tech-lcoe-documentation.html - """ - techs = technologies[ - [ - "technical_life", - "interest_rate", - "cap_par", - "var_par", - "fix_par", - "fixed_inputs", - "flexible_inputs", - "fixed_outputs", - "utilization_factor", - ] - ] - if "year" in techs.dims: - techs = techs.interp( - year=prices.year, method=interpolation, kwargs={"fill_value": fill_value} - ) - if filters is not None: - prices = prices.sel({k: v for k, v in filters.items() if k in prices.dims}) - techs = techs.sel({k: v for k, v in filters.items() if k in techs.dims}) - - assert {"timeslice", "commodity"}.issubset(prices.dims) - - life = techs.technical_life.astype(int) - - rates = techs.interest_rate / (1 - (1 + techs.interest_rate) ** (-life)) - - # Capital costs - annualized_capital_costs = distribute_timeslice( - techs.cap_par * rates, level=timeslice_level - ) / broadcast_timeslice(techs.utilization_factor, level=timeslice_level) - - # Fixed and variable running costs - o_and_e_costs = distribute_timeslice( - techs.fix_par + techs.var_par, level=timeslice_level - ) / broadcast_timeslice(techs.utilization_factor, level=timeslice_level) - - # Fuel costs from fixed and flexible inputs - fuel_costs = ( - distribute_timeslice(techs.fixed_inputs, level=timeslice_level) * prices - ).sum("commodity") - fuel_costs += ( - distribute_timeslice(techs.flexible_inputs, level=timeslice_level) * prices - ).sum("commodity") - - # Environmental costs - if "region" in techs.dims: - env_costs = ( - (distribute_timeslice(techs.fixed_outputs, level=timeslice_level) * prices) - .sel(region=techs.region) - .sel(commodity=is_pollutant(techs.comm_usage)) - .sum("commodity") - ) - else: - env_costs = ( - (distribute_timeslice(techs.fixed_outputs, level=timeslice_level) * prices) - .sel(commodity=is_pollutant(techs.comm_usage)) - .sum("commodity") - ) - return annualized_capital_costs + o_and_e_costs + env_costs + fuel_costs - - def supply_cost( - production: xr.DataArray, lcoe: xr.DataArray, asset_dim: Optional[str] = "asset" + production: xr.DataArray, lcoe: xr.DataArray, asset_dim: str | None = "asset" ) -> xr.DataArray: """Supply cost given production and the levelized cost of energy. @@ -470,8 +440,7 @@ def supply_cost( `muse.quantities.production`. lcoe: Levelized cost of energy for each good produced. In practice, it can be obtained from market prices via - `muse.costs.annual_levelized_cost_of_energy` or - `muse.costs.lifetime_levelized_cost_of_energy`. + `muse.costs.levelized_cost_of_energy`. asset_dim: Name of the dimension(s) holding assets, processes or technologies. """ data = xr.Dataset(dict(production=production, prices=production * lcoe)) @@ -503,9 +472,55 @@ def capital_recovery_factor(technologies: xr.Dataset) -> xr.DataArray: crf = technologies.interest_rate / ( 1 - (1 / (1 + technologies.interest_rate) ** nyears) ) + assert "year" not in crf.dims return crf -def discount_factor(years, interest_rate, mask=1.0): - """Calculate an array with the rate (aka discount factor) values over the years.""" - return mask / (1 + interest_rate) ** years +def annual_to_lifetime(costs: xr.DataArray, technologies: xr.Dataset): + """Convert annual costs to lifetime costs. + + Costs are provided for a single year. These same costs are assumed to apply for the + full lifetime of the technologies, subject to a discount factor. The costs are then + summed over the lifetime of the technologies. + + Args: + costs: xr.DataArray of costs for a single year. + technologies: xr.Dataset of technology parameters + """ + assert "year" not in costs.dims + assert "year" not in technologies.dims + assert "timeslice" not in costs.dims + life = technologies.technical_life.astype(int) + iyears = range(life.values.max()) + years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") + rates = discount_factor( + years=years, + interest_rate=technologies.interest_rate, + mask=years <= life, + ) + return (costs * rates).sum("year") + + +def discount_factor( + years: xr.DataArray, interest_rate: xr.DataArray, mask: xr.DataArray | None = None +): + """Calculate an array with of discount factor values over the years. + + Args: + years: xr.DataArray with the years counting from the present year + (i.e. current year = 0) + interest_rate: xr.DataArray with the interest rate for different technologies + mask: Optional mask to apply to the result (e.g. cutting to zero after the + technology lifetime) + """ + assert set(years.dims) == {"year"} + assert "year" not in interest_rate.dims + + # Calculate discount factor over the years + df = 1 / (1 + interest_rate) ** years + + # Apply mask + if mask is not None: + assert set(mask.dims) == set(interest_rate.dims) | {"year"} + df = df * mask + return df diff --git a/src/muse/objectives.py b/src/muse/objectives.py index 08a705f87..afed259db 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -71,7 +71,7 @@ def comfort( from muse.outputs.cache import cache_quantity from muse.registration import registrator from muse.timeslices import broadcast_timeslice, distribute_timeslice, drop_timeslice -from muse.utilities import check_dimensions, filter_input +from muse.utilities import check_dimensions OBJECTIVE_SIGNATURE = Callable[ [xr.Dataset, xr.DataArray, xr.DataArray, KwArg(Any)], xr.DataArray @@ -257,6 +257,7 @@ def consumption( technologies: xr.Dataset, demand: xr.DataArray, prices: xr.DataArray, + timeslice_level: Optional[str] = None, *args, **kwargs, ) -> xr.DataArray: @@ -265,9 +266,21 @@ def consumption( Currently, the consumption is implemented for commodity_max == +infinity. """ from muse.quantities import consumption + from muse.timeslices import broadcast_timeslice, distribute_timeslice - result = consumption(technologies=technologies, prices=prices, production=demand) - return result.sum("commodity") + capacity = capacity_to_service_demand(technologies, demand) + production = ( + broadcast_timeslice(capacity, level=timeslice_level) + * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) + * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) + ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) + return consump.sum("commodity") @register_objective @@ -290,10 +303,10 @@ def fixed_costs( :math:`\alpha` and :math:`\beta` are "fix_par" and "fix_exp" in :ref:`inputs-technodata`, respectively. """ - from muse.quantities import capacity_to_service_demand + from muse.costs import fixed_costs - capacity = capacity_to_service_demand(technologies=technologies, demand=demand) - result = technologies.fix_par * (capacity**technologies.fix_exp) + capacity = capacity_to_service_demand(technologies, demand) + result = fixed_costs(technologies, capacity) return result @@ -311,7 +324,10 @@ def capital_costs( :math:`\alpha` is "cap_exp". In other words, capital costs are constant across the simulation for each technology. """ - result = technologies.cap_par * (technologies.scaling_size**technologies.cap_exp) + from muse.costs import capital_costs + + capacity = capacity_to_service_demand(technologies, demand) + result = capital_costs(technologies, capacity, method="lifetime") result = xr.broadcast(result, demand.asset)[0] return result @@ -321,6 +337,7 @@ def emission_cost( technologies: xr.Dataset, demand: xr.DataArray, prices: xr.DataArray, + timeslice_level: Optional[str] = None, *args, **kwargs, ) -> xr.DataArray: @@ -336,15 +353,16 @@ def emission_cost( with :math:`s` the timeslices and :math:`c` the commodity. """ - from muse.commodities import is_enduse, is_pollutant + from muse.costs import environmental_costs - enduses = is_enduse(technologies.comm_usage.sel(commodity=demand.commodity)) - total = demand.sel(commodity=enduses).sum("commodity") - envs = is_pollutant(technologies.comm_usage) - prices = filter_input(prices, year=demand.year.item(), commodity=envs) - return total * (distribute_timeslice(technologies.fixed_outputs) * prices).sum( - "commodity" + capacity = capacity_to_service_demand(technologies, demand) + production = ( + broadcast_timeslice(capacity, level=timeslice_level) + * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) + * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + result = environmental_costs(technologies, prices, production) + return result @register_objective @@ -352,17 +370,29 @@ def fuel_consumption_cost( technologies: xr.Dataset, demand: xr.DataArray, prices: xr.DataArray, + timeslice_level: Optional[str] = None, *args, **kwargs, ): """Cost of fuels when fulfilling whole demand.""" - from muse.commodities import is_fuel + from muse.costs import fuel_costs from muse.quantities import consumption + from muse.timeslices import broadcast_timeslice, distribute_timeslice - commodity = is_fuel(technologies.comm_usage.sel(commodity=demand.commodity)) - fcons = consumption(technologies=technologies, prices=prices, production=demand) - prices = filter_input(prices, year=demand.year.item(), commodity=commodity) - return (fcons * prices).sum("commodity") + capacity = capacity_to_service_demand(technologies, demand) + production = ( + broadcast_timeslice(capacity, level=timeslice_level) + * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) + * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) + ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) + result = fuel_costs(technologies, prices, consump) + return result @register_objective(name=["ALCOE"]) @@ -370,6 +400,7 @@ def annual_levelized_cost_of_energy( technologies: xr.Dataset, demand: xr.DataArray, prices: xr.DataArray, + timeslice_level: Optional[str] = None, *args, **kwargs, ): @@ -381,14 +412,32 @@ def annual_levelized_cost_of_energy( See :py:func:`muse.costs.annual_levelized_cost_of_energy` for more details. """ - from muse.costs import annual_levelized_cost_of_energy as aLCOE + from muse.costs import levelized_cost_of_energy as LCOE + from muse.quantities import consumption - result = filter_input( - aLCOE(technologies=technologies, prices=prices).max("timeslice"), - year=demand.year.item(), + capacity = capacity_to_service_demand(technologies, demand) + production = ( + broadcast_timeslice(capacity, level=timeslice_level) + * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) + * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) + ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, ) - result = xr.broadcast(result, demand.asset)[0] - return result + + results = LCOE( + technologies=technologies, + prices=prices, + capacity=capacity, + production=production, + consumption=consump, + method="annual", + ) + + return results.where(np.isfinite(results)).fillna(0.0) @register_objective(name=["LCOE", "LLCOE"]) @@ -407,8 +456,8 @@ def lifetime_levelized_cost_of_energy( The LCOE is set to zero for those timeslices where the production is zero, normally due to a zero utilisation factor. """ - from muse.costs import lifetime_levelized_cost_of_energy as LCOE - from muse.quantities import capacity_to_service_demand + from muse.costs import levelized_cost_of_energy as LCOE + from muse.quantities import capacity_to_service_demand, consumption capacity = capacity_to_service_demand( technologies=technologies, demand=demand, timeslice_level=timeslice_level @@ -418,14 +467,20 @@ def lifetime_levelized_cost_of_energy( * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) results = LCOE( technologies=technologies, prices=prices, capacity=capacity, production=production, - year=demand.year.item(), - timeslice_level=timeslice_level, + consumption=consump, + method="lifetime", ) return results.where(np.isfinite(results)).fillna(0.0) @@ -445,7 +500,7 @@ def net_present_value( See :py:func:`muse.costs.net_present_value` for more details. """ from muse.costs import net_present_value as NPV - from muse.quantities import capacity_to_service_demand + from muse.quantities import capacity_to_service_demand, consumption capacity = capacity_to_service_demand(technologies=technologies, demand=demand) production = ( @@ -453,14 +508,19 @@ def net_present_value( * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) results = NPV( technologies=technologies, prices=prices, capacity=capacity, production=production, - year=demand.year.item(), - timeslice_level=timeslice_level, + consumption=consump, ) return results @@ -479,7 +539,7 @@ def net_present_cost( See :py:func:`muse.costs.net_present_cost` for more details. """ from muse.costs import net_present_cost as NPC - from muse.quantities import capacity_to_service_demand + from muse.quantities import capacity_to_service_demand, consumption capacity = capacity_to_service_demand(technologies=technologies, demand=demand) production = ( @@ -487,13 +547,19 @@ def net_present_cost( * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) results = NPC( technologies=technologies, prices=prices, capacity=capacity, production=production, - year=demand.year.item(), + consumption=consump, ) return results @@ -512,7 +578,7 @@ def equivalent_annual_cost( See :py:func:`muse.costs.equivalent_annual_cost` for more details. """ from muse.costs import equivalent_annual_cost as EAC - from muse.quantities import capacity_to_service_demand + from muse.quantities import capacity_to_service_demand, consumption capacity = capacity_to_service_demand(technologies=technologies, demand=demand) production = ( @@ -520,13 +586,18 @@ def equivalent_annual_cost( * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) results = EAC( technologies=technologies, prices=prices, capacity=capacity, production=production, - year=demand.year.item(), - timeslice_level=timeslice_level, + consumption=consump, ) return results diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index 7d9284daf..cec60ffec 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -414,7 +414,7 @@ def metric_lcoe( def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame: """Levelized cost of energy () of technologies over their lifetime.""" - from muse.costs import lifetime_levelized_cost_of_energy as LCOE + from muse.costs import levelized_cost_of_energy as LCOE from muse.quantities import capacity_to_service_demand # Filtering of the inputs @@ -453,13 +453,17 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data * distribute_timeslice(techs.fixed_outputs) * techs.utilization_factor ) + consump = consumption( + technologies=technologies, prices=prices, production=production + ) result = LCOE( prices=prices, technologies=techs, capacity=capacity, production=production, - year=agent.year, + consumption=consump, + method="lifetime", ) data_agent = result diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 23ce7e409..c5626a2c5 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -323,9 +323,7 @@ def consumption( ) # Calculate degree of technology activity - prod_amplitude = production_amplitude( - production, params, timeslice_level=timeslice_level - ) + prod_amplitude = production_amplitude(production, params) # Calculate consumption of fixed commodities consumption_fixed = prod_amplitude * broadcast_timeslice( @@ -558,7 +556,6 @@ def capacity_to_service_demand( def production_amplitude( production: xr.DataArray, technologies: xr.Dataset, - timeslice_level: Optional[str] = None, ) -> xr.DataArray: """Calculates the degree of technology activity based on production data. @@ -576,13 +573,16 @@ def production_amplitude( Must have `timeslice` and `commodity` dimensions. May also have other dimensions e.g. `region`, `year`, etc. technologies: Dataset of technology parameters - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day"). - Must match the timeslice level of `production` Returns: DataArray with production amplitudes for each technology in each timeslice. Will have the same dimensions as `production`, minus the `commodity` dimension. """ + from muse.timeslices import get_level + + assert set(technologies.dims).issubset(set(production.dims)) + timeslice_level = get_level(production) + return ( production / broadcast_timeslice(technologies.fixed_outputs, level=timeslice_level) diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 26e721606..839afbee4 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -14,7 +14,12 @@ from muse.sectors.abstract import AbstractSector from muse.sectors.register import register_sector from muse.sectors.subsector import Subsector -from muse.timeslices import compress_timeslice, expand_timeslice, get_level +from muse.timeslices import ( + broadcast_timeslice, + compress_timeslice, + expand_timeslice, + get_level, +) @register_sector(name="default") @@ -289,7 +294,7 @@ def save_outputs(self) -> None: def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: """Computes resulting market: production, consumption, and costs.""" from muse.commodities import is_pollutant - from muse.costs import annual_levelized_cost_of_energy, supply_cost + from muse.costs import levelized_cost_of_energy, supply_cost from muse.quantities import consumption from muse.utilities import broadcast_techs @@ -306,18 +311,28 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: # Calculate consumption consume = consumption( - technologies, supply, market.prices, timeslice_level=self.timeslice_level + technologies, + production=supply, + prices=market.prices, + timeslice_level=self.timeslice_level, ) - # Calculate commodity prices + # Calculate LCOE + # We select data for the second year, which corresponds to the investment year technodata = cast(xr.Dataset, broadcast_techs(technologies, supply)) + lcoe = levelized_cost_of_energy( + prices=market.prices.sel(region=supply.region).isel(year=1), + technologies=technodata, + capacity=capacity.isel(year=1), + production=supply.isel(year=1), + consumption=consume.isel(year=1), + method="annual", + ) + + # Calculate new commodity prices costs = supply_cost( supply.where(~is_pollutant(supply.comm_usage), 0), - annual_levelized_cost_of_energy( - prices=market.prices.sel(region=supply.region), - technologies=technodata, - timeslice_level=self.timeslice_level, - ), + broadcast_timeslice(lcoe, level=self.timeslice_level), asset_dim="asset", ) diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 5d4fbe222..e7cfae67c 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -10,48 +10,53 @@ A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index f447aa61e..17bba3927 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.37740000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62610000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.72190000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.37740000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62610000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.72190000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.37740000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62610000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.72190000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.37740000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62610000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.72190000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.37740000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62610000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.72190000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.37740000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62610000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.72190000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.93960000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43650000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.17680000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.93960000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43650000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.60150000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.17680000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.93960000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43650000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.60150000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.17680000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.93960000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43650000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.60150000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.17680000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.93960000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43650000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.60150000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.17680000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.93960000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43650000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.60150000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.17680000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.41720000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46830000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.23780000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.41720000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46830000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.10090000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.23780000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.41720000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46830000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.23780000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.41720000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46830000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.10090000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.23780000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.41720000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46830000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.10090000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.23780000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.41720000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46830000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.10090000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.23780000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.70070000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48720000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.91910000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.70070000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48720000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.80410000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.91910000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.70070000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48720000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.91910000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.70070000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48720000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.80410000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.91910000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.70070000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48720000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.80410000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.91910000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.70070000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48720000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.80410000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.91910000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.10180000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.51400000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,27.99370000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.79490000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.10180000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.51400000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,27.99370000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.79490000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.10180000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.51400000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,27.99370000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.79490000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.10180000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.51400000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,27.99370000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.79490000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.10180000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.51400000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.99370000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.79490000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.10180000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.51400000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,27.99370000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.79490000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.50400000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.54080000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.47410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.50400000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.54080000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.69170000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.47410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.50400000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.54080000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.47410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.50400000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.54080000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.69170000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.47410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.50400000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.54080000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.69170000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.47410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.50400000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.54080000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.69170000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.47410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index bd65fa315..e0af1be69 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -10,48 +10,43 @@ A1,19.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030 A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2030 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2030 A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2030 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2030 A1,11.62600000000,R1,2020,R1,gas,gassupply1,retrofit,2030 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035 A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2035 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2035 A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2035 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2035 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2035 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040 A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2040 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2040 A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2040 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2040 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2040 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2040 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045 A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2045 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2045 A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2045 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2045 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2045 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2045 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2050 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2050 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 A1,7.91410000000,R1,2045,R1,power,windturbine,retrofit,2050 A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2050 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2050 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2050 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index bbd8be713..d1d6049d3 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.34640000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62450000000,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.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,2.34640000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62450000000,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.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,2.34640000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62450000000,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.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,2.34640000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62450000000,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.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,2.34640000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62450000000,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.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,2.34640000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62450000000,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.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,2.90250000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43400000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.76060000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.90170000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.90250000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43400000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.76060000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.90170000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.90250000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43400000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.76060000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.90170000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.90250000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43400000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.76060000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.90170000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.90250000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43400000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.76060000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.90170000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.90250000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43400000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.76060000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.90170000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.38650000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46630000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.07660000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.22810000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.38650000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46630000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.07660000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.22810000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.38650000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46630000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.07660000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.22810000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.38650000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46630000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.07660000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.22810000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.38650000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46630000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.07660000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.22810000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.38650000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46630000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.07660000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.22810000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.73210000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48930000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.72020000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.08550000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.73210000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48930000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.72020000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.08550000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.73210000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48930000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.72020000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.08550000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.73210000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48930000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.72020000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.08550000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.73210000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48930000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.72020000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.08550000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.73210000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48930000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.72020000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.08550000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.19980000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.52050000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,25.30560000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.71960000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.19980000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.52050000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,25.30560000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.71960000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.19980000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.52050000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,25.30560000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.71960000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.19980000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.52050000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,25.30560000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.71960000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.19980000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.52050000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,25.30560000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.71960000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.19980000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.52050000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,25.30560000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.71960000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.56350000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.54470000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,26.53870000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.21290000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.56350000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.54470000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,26.53870000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.21290000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.56350000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.54470000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,26.53870000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.21290000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.56350000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.54470000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,26.53870000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.21290000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.56350000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.54470000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,26.53870000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.21290000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.56350000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.54470000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,26.53870000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.21290000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 96be5b043..76b93450a 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,0.91100000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.56480000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.60100000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.66660000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,0.91100000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.56480000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.60100000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.66660000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,0.91100000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.56480000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.60100000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.66660000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,0.91100000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.56480000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.60100000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.66660000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,0.91100000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.56480000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.60100000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.66660000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,0.91100000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.56480000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.60100000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.66660000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index e192c6924..7301cf34c 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -13,52 +13,52 @@ A1,4.00000000000,R1,2020,R1,residential,gasstove,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030 A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,17.83930000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035 A1,5.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,8.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040 A1,8.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,13.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045 A1,13.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,11.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,4.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,0.20670000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2050 A1,17.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 A1,11.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,16.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,4.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 A1,0.20670000000,R1,2040,R1,gas,gassupply1,newcapa,2050 A1,3.33330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 3ee3488c5..63d4df954 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,2.42260000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,1.12700000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.57780000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.24120000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,2.42260000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,1.12700000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.57780000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.24120000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,2.42260000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,1.12700000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.57780000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.24120000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,2.42260000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,1.12700000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.57780000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.24120000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,2.42260000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,1.12700000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.57780000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.24120000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,2.42260000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,1.12700000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.57780000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.24120000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,2.98680000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.95680000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,17.14260000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.06410000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,2.98680000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.95680000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.14260000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.06410000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,2.98680000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.95680000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.14260000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.06410000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,2.98680000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.95680000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.14260000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.06410000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,2.98680000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.95680000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.14260000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.06410000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,2.98680000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.95680000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.14260000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.06410000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,3.19280000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,1.02520000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.00770000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.78430000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,3.19280000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,1.02520000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.00770000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.78430000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,3.19280000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,1.02520000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,17.00770000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.78430000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,3.19280000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,1.02520000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.00770000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.78430000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,3.19280000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,1.02520000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,17.00770000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.78430000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,3.19280000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,1.02520000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,17.00770000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.78430000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,3.05660000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.44430000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,17.39110000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.40050000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,3.05660000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.44430000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,17.39110000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.40050000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,3.05660000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.44430000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,17.39110000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.40050000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,3.05660000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.44430000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,17.39110000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.40050000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,3.05660000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.44430000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,17.39110000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.40050000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,3.05660000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.44430000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,17.39110000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.40050000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,3.29010000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.45980000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,17.46810000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.55380000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,3.29010000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.45980000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,17.46810000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.55380000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,3.29010000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.45980000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,17.46810000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.55380000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,3.29010000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.45980000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,17.46810000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.55380000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,3.29010000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.45980000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,17.46810000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.55380000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,3.29010000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.45980000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.46810000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.55380000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,3.52320000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.47540000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,17.52790000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.58470000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,3.52320000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.47540000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.52790000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.58470000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,3.52320000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.47540000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.52790000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.58470000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,3.52320000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.47540000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.52790000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.58470000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,3.52320000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.47540000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.52790000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.58470000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,3.52320000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.47540000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.52790000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.58470000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 31ec35621..85fd4acb7 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -14,96 +14,96 @@ ammonia,all-week,all-day,spring-autumn,321.15000000000,R1,2,MUS$2010/Mt,2010 fuel3,all-week,all-day,winter,0.06170000000,R1,0,MUS$2010/PJ,2015 fuel1,all-week,all-day,winter,1.08770000000,R1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.51690000000,R1,0,MUS$2010/PJ,2015 -ammonia,all-week,all-day,winter,131.07760000000,R1,0,MUS$2010/Mt,2015 +ammonia,all-week,all-day,winter,393.51770000000,R1,0,MUS$2010/Mt,2015 fuel3,all-week,all-day,summer,0.06170000000,R1,1,MUS$2010/PJ,2015 fuel1,all-week,all-day,summer,1.08770000000,R1,1,MUS$2010/PJ,2015 fuel2,all-week,all-day,summer,9.51690000000,R1,1,MUS$2010/PJ,2015 -ammonia,all-week,all-day,summer,131.07760000000,R1,1,MUS$2010/Mt,2015 +ammonia,all-week,all-day,summer,393.51770000000,R1,1,MUS$2010/Mt,2015 fuel3,all-week,all-day,spring-autumn,0.06170000000,R1,2,MUS$2010/PJ,2015 fuel1,all-week,all-day,spring-autumn,1.08770000000,R1,2,MUS$2010/PJ,2015 fuel2,all-week,all-day,spring-autumn,9.51690000000,R1,2,MUS$2010/PJ,2015 -ammonia,all-week,all-day,spring-autumn,131.07760000000,R1,2,MUS$2010/Mt,2015 +ammonia,all-week,all-day,spring-autumn,393.51770000000,R1,2,MUS$2010/Mt,2015 fuel3,all-week,all-day,winter,0.07020000000,R1,0,MUS$2010/PJ,2020 fuel1,all-week,all-day,winter,1.17540000000,R1,0,MUS$2010/PJ,2020 fuel2,all-week,all-day,winter,9.48260000000,R1,0,MUS$2010/PJ,2020 -ammonia,all-week,all-day,winter,138.74760000000,R1,0,MUS$2010/Mt,2020 +ammonia,all-week,all-day,winter,416.52820000000,R1,0,MUS$2010/Mt,2020 fuel3,all-week,all-day,summer,0.07020000000,R1,1,MUS$2010/PJ,2020 fuel1,all-week,all-day,summer,1.17540000000,R1,1,MUS$2010/PJ,2020 fuel2,all-week,all-day,summer,9.48260000000,R1,1,MUS$2010/PJ,2020 -ammonia,all-week,all-day,summer,138.74760000000,R1,1,MUS$2010/Mt,2020 +ammonia,all-week,all-day,summer,416.52820000000,R1,1,MUS$2010/Mt,2020 fuel3,all-week,all-day,spring-autumn,0.07020000000,R1,2,MUS$2010/PJ,2020 fuel1,all-week,all-day,spring-autumn,1.17540000000,R1,2,MUS$2010/PJ,2020 fuel2,all-week,all-day,spring-autumn,9.48260000000,R1,2,MUS$2010/PJ,2020 -ammonia,all-week,all-day,spring-autumn,138.74760000000,R1,2,MUS$2010/Mt,2020 +ammonia,all-week,all-day,spring-autumn,416.52820000000,R1,2,MUS$2010/Mt,2020 fuel3,all-week,all-day,winter,0.08280000000,R1,0,MUS$2010/PJ,2025 fuel1,all-week,all-day,winter,1.16670000000,R1,0,MUS$2010/PJ,2025 fuel2,all-week,all-day,winter,10.71080000000,R1,0,MUS$2010/PJ,2025 -ammonia,all-week,all-day,winter,157.12090000000,R1,0,MUS$2010/Mt,2025 +ammonia,all-week,all-day,winter,471.64890000000,R1,0,MUS$2010/Mt,2025 fuel3,all-week,all-day,summer,0.08280000000,R1,1,MUS$2010/PJ,2025 fuel1,all-week,all-day,summer,1.16670000000,R1,1,MUS$2010/PJ,2025 fuel2,all-week,all-day,summer,10.71080000000,R1,1,MUS$2010/PJ,2025 -ammonia,all-week,all-day,summer,157.12090000000,R1,1,MUS$2010/Mt,2025 +ammonia,all-week,all-day,summer,471.64890000000,R1,1,MUS$2010/Mt,2025 fuel3,all-week,all-day,spring-autumn,0.08280000000,R1,2,MUS$2010/PJ,2025 fuel1,all-week,all-day,spring-autumn,1.16670000000,R1,2,MUS$2010/PJ,2025 fuel2,all-week,all-day,spring-autumn,10.71080000000,R1,2,MUS$2010/PJ,2025 -ammonia,all-week,all-day,spring-autumn,157.12090000000,R1,2,MUS$2010/Mt,2025 +ammonia,all-week,all-day,spring-autumn,471.64890000000,R1,2,MUS$2010/Mt,2025 fuel3,all-week,all-day,winter,0.09540000000,R1,0,MUS$2010/PJ,2030 fuel1,all-week,all-day,winter,1.15790000000,R1,0,MUS$2010/PJ,2030 fuel2,all-week,all-day,winter,11.93900000000,R1,0,MUS$2010/PJ,2030 -ammonia,all-week,all-day,winter,175.32120000000,R1,0,MUS$2010/Mt,2030 +ammonia,all-week,all-day,winter,526.25020000000,R1,0,MUS$2010/Mt,2030 fuel3,all-week,all-day,summer,0.09540000000,R1,1,MUS$2010/PJ,2030 fuel1,all-week,all-day,summer,1.15790000000,R1,1,MUS$2010/PJ,2030 fuel2,all-week,all-day,summer,11.93900000000,R1,1,MUS$2010/PJ,2030 -ammonia,all-week,all-day,summer,175.32120000000,R1,1,MUS$2010/Mt,2030 +ammonia,all-week,all-day,summer,526.25020000000,R1,1,MUS$2010/Mt,2030 fuel3,all-week,all-day,spring-autumn,0.09540000000,R1,2,MUS$2010/PJ,2030 fuel1,all-week,all-day,spring-autumn,1.15790000000,R1,2,MUS$2010/PJ,2030 fuel2,all-week,all-day,spring-autumn,11.93900000000,R1,2,MUS$2010/PJ,2030 -ammonia,all-week,all-day,spring-autumn,175.32120000000,R1,2,MUS$2010/Mt,2030 +ammonia,all-week,all-day,spring-autumn,526.25020000000,R1,2,MUS$2010/Mt,2030 fuel3,all-week,all-day,winter,0.09070000000,R1,0,MUS$2010/PJ,2035 fuel1,all-week,all-day,winter,1.14910000000,R1,0,MUS$2010/PJ,2035 fuel2,all-week,all-day,winter,11.81550000000,R1,0,MUS$2010/PJ,2035 -ammonia,all-week,all-day,winter,165.03960000000,R1,0,MUS$2010/Mt,2035 +ammonia,all-week,all-day,winter,495.40650000000,R1,0,MUS$2010/Mt,2035 fuel3,all-week,all-day,summer,0.09070000000,R1,1,MUS$2010/PJ,2035 fuel1,all-week,all-day,summer,1.14910000000,R1,1,MUS$2010/PJ,2035 fuel2,all-week,all-day,summer,11.81550000000,R1,1,MUS$2010/PJ,2035 -ammonia,all-week,all-day,summer,165.03960000000,R1,1,MUS$2010/Mt,2035 +ammonia,all-week,all-day,summer,495.40650000000,R1,1,MUS$2010/Mt,2035 fuel3,all-week,all-day,spring-autumn,0.09070000000,R1,2,MUS$2010/PJ,2035 fuel1,all-week,all-day,spring-autumn,1.14910000000,R1,2,MUS$2010/PJ,2035 fuel2,all-week,all-day,spring-autumn,11.81550000000,R1,2,MUS$2010/PJ,2035 -ammonia,all-week,all-day,spring-autumn,165.03960000000,R1,2,MUS$2010/Mt,2035 +ammonia,all-week,all-day,spring-autumn,495.40650000000,R1,2,MUS$2010/Mt,2035 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2040 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2040 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2040 -ammonia,all-week,all-day,winter,154.56700000000,R1,0,MUS$2010/Mt,2040 +ammonia,all-week,all-day,winter,463.98930000000,R1,0,MUS$2010/Mt,2040 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2040 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2040 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2040 -ammonia,all-week,all-day,summer,154.56700000000,R1,1,MUS$2010/Mt,2040 +ammonia,all-week,all-day,summer,463.98930000000,R1,1,MUS$2010/Mt,2040 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2040 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2040 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2040 -ammonia,all-week,all-day,spring-autumn,154.56700000000,R1,2,MUS$2010/Mt,2040 +ammonia,all-week,all-day,spring-autumn,463.98930000000,R1,2,MUS$2010/Mt,2040 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2045 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2045 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2045 -ammonia,all-week,all-day,winter,153.83350000000,R1,0,MUS$2010/Mt,2045 +ammonia,all-week,all-day,winter,461.78860000000,R1,0,MUS$2010/Mt,2045 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2045 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2045 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2045 -ammonia,all-week,all-day,summer,153.83350000000,R1,1,MUS$2010/Mt,2045 +ammonia,all-week,all-day,summer,461.78860000000,R1,1,MUS$2010/Mt,2045 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 -ammonia,all-week,all-day,spring-autumn,153.83350000000,R1,2,MUS$2010/Mt,2045 +ammonia,all-week,all-day,spring-autumn,461.78860000000,R1,2,MUS$2010/Mt,2045 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,153.09170000000,R1,0,MUS$2010/Mt,2050 +ammonia,all-week,all-day,winter,459.56320000000,R1,0,MUS$2010/Mt,2050 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,153.09170000000,R1,1,MUS$2010/Mt,2050 +ammonia,all-week,all-day,summer,459.56320000000,R1,1,MUS$2010/Mt,2050 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,153.09170000000,R1,2,MUS$2010/Mt,2050 +ammonia,all-week,all-day,spring-autumn,459.56320000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index 5d8535537..cdad299b3 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -15,56 +15,61 @@ A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,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,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index b2f3d4bcb..6b2d01f5b 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.37740000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62610000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.72190000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.37740000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62610000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.72190000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.37740000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62610000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.72190000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.37740000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62610000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.72190000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.37740000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62610000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.72190000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.37740000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62610000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.72190000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.93960000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43650000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.23800000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.93960000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43650000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.60150000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.23800000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.93960000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43650000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.60150000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.23800000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.93960000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43650000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.60150000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.23800000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.93960000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43650000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.60150000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.23800000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.93960000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43650000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.60150000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.23800000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.41720000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46830000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.23780000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.41720000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46830000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.10090000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.23780000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.41720000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46830000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.23780000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.41720000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46830000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.10090000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.23780000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.41720000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46830000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.10090000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.23780000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.41720000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46830000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.10090000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.23780000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.65230000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48400000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.91910000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.65230000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48400000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.80410000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.91910000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.65230000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48400000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.91910000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.65230000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48400000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.80410000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.91910000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.65230000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48400000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.80410000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.91910000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.65230000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48400000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.80410000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.91910000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.10180000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.51400000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,27.99370000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.79490000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.10180000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.51400000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,27.99370000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.79490000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.10180000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.51400000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,27.99370000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.79490000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.10180000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.51400000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,27.99370000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.79490000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.10180000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.51400000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.99370000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.79490000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.10180000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.51400000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,27.99370000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.79490000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.45150000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.53730000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.47410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.45150000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.53730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.69170000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.47410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.45150000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.53730000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.47410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.45150000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.53730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.69170000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.47410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.45150000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.53730000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.69170000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.47410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.45150000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.53730000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.69170000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.47410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index a9ef8e426..118984620 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -23,111 +23,111 @@ electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,2.29980000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,2.37690000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.78380000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.93720000000,R2,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,2.29980000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,2.37690000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.78380000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.93720000000,R2,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,2.29980000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,2.37690000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.78380000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.93720000000,R2,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,2.29980000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,2.37690000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.78380000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.93720000000,R2,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,2.29980000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,2.37690000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.78380000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.93720000000,R2,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,2.29980000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,2.37690000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.78380000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.93720000000,R2,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,1.33800000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,1.44120000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.46420000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.56420000000,R2,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,1.33800000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,1.44120000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.46420000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.56420000000,R2,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,1.33800000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,1.44120000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.46420000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.56420000000,R2,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,1.33800000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,1.44120000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.46420000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.56420000000,R2,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,1.33800000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,1.44120000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.46420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.56420000000,R2,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,1.33800000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,1.44120000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.46420000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.56420000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,1.01070000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,1.12280000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.35550000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.43730000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,1.01070000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,1.12280000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.35550000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.43730000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,1.01070000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,1.12280000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.35550000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.43730000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,1.01070000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,1.12280000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.35550000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.43730000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,1.01070000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,1.12280000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.35550000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.43730000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,1.01070000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,1.12280000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.35550000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.43730000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,21.63640000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,115.63450000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,21.44510000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,175.99040000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,21.63640000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,115.63450000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,21.44510000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,175.99040000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,21.63640000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,115.63450000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,21.44510000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,175.99040000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,21.63640000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,115.63450000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,21.44510000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,175.99040000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,21.63640000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,115.63450000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,21.44510000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,175.99040000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,21.63640000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,115.63450000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,21.44510000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,175.99040000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,29.89130000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,164.78670000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,31.04120000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,247.37670000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,29.89130000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,164.78670000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,31.04120000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,247.37670000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,29.89130000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,164.78670000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,31.04120000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,247.37670000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,29.89130000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,164.78670000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,31.04120000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,247.37670000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,29.89130000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,164.78670000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,31.04120000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,247.37670000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,29.89130000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,164.78670000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,31.04120000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,247.37670000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8677.86150000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,8677.86150000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,42.27370000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,216.76620000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,45.43210000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,329.68250000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,8677.86150000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,8677.86150000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,42.27370000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,216.76620000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,45.43210000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,329.68250000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,8677.86150000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,8677.86150000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,42.27370000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,216.76620000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,45.43210000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,329.68250000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,8677.86150000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,8677.86150000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,42.27370000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,216.76620000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,45.43210000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,329.68250000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8677.86150000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8677.86150000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,42.27370000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,216.76620000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,45.43210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,329.68250000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,8677.86150000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,8677.86150000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,42.27370000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,216.76620000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,45.43210000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,329.68250000000,R2,5,MUS$2010/PJ,2035 diff --git a/tests/test_costs.py b/tests/test_costs.py index 1099e2312..2cb9271d7 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -1,106 +1,265 @@ -from pytest import fixture +from numpy import isclose +from pytest import fixture, mark + +YEAR = 2030 @fixture def _prices(market): prices = market.prices - return prices + return prices.sel(year=YEAR) @fixture -def _capacity(technologies, demand_share): +def _technologies(technologies): + return technologies.sel(year=YEAR) + + +@fixture +def _capacity(_technologies, demand_share): from muse.quantities import capacity_to_service_demand capacity = capacity_to_service_demand( - technologies=technologies, demand=demand_share + technologies=_technologies, demand=demand_share ) return capacity @fixture -def _production(technologies, _capacity): +def _production(_technologies, _capacity): from muse.timeslices import broadcast_timeslice, distribute_timeslice production = ( broadcast_timeslice(_capacity) - * distribute_timeslice(technologies.fixed_outputs) - * broadcast_timeslice(technologies.utilization_factor) + * distribute_timeslice(_technologies.fixed_outputs) + * broadcast_timeslice(_technologies.utilization_factor) ) return production -def test_fixtures(technologies, _prices, _capacity, _production): +@fixture +def _consumption(_technologies, _capacity): + from muse.timeslices import broadcast_timeslice, distribute_timeslice + + consumption = ( + broadcast_timeslice(_capacity) + * distribute_timeslice(_technologies.fixed_inputs) + * broadcast_timeslice(_technologies.utilization_factor) + ) + return consumption + + +def test_fixtures(_technologies, _prices, _capacity, _production, _consumption): """Validating that the fixtures have appropriate dimensions.""" - assert set(technologies.dims) == {"commodity", "region", "technology", "year"} - assert set(_prices.dims) == {"commodity", "region", "timeslice", "year"} - assert set(_capacity.dims) == {"asset", "region", "technology", "year"} - assert set(_production.dims) == { - "asset", - "commodity", - "region", - "technology", - "timeslice", - "year", - } + assert set(_technologies.dims) == {"commodity", "region", "technology"} + assert set(_prices.dims) == {"commodity", "region", "timeslice"} + assert set(_capacity.dims) == {"asset", "region", "technology"} + assert ( + set(_production.dims) + == set(_consumption.dims) + == { + "asset", + "commodity", + "region", + "technology", + "timeslice", + } + ) + + +def test_capital_costs(_technologies, _capacity): + from muse.costs import capital_costs + + result = capital_costs(_technologies, _capacity) + assert set(result.dims) == {"asset", "region", "technology"} + + +def test_environmental_costs(_technologies, _prices, _production): + from muse.costs import environmental_costs + + result = environmental_costs(_technologies, _prices, _production) + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} + + +def test_fuel_costs(_technologies, _prices, _consumption): + from muse.costs import fuel_costs + + result = fuel_costs(_technologies, _prices, _consumption) + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} + + +def test_material_costs(_technologies, _prices, _consumption): + from muse.costs import material_costs + + result = material_costs(_technologies, _prices, _consumption) + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} + + +def test_fixed_costs(_technologies, _capacity): + from muse.costs import fixed_costs + + result = fixed_costs(_technologies, _capacity) + assert set(result.dims) == {"asset", "region", "technology"} + + +def test_variable_costs(_technologies, _production): + from muse.costs import variable_costs + result = variable_costs(_technologies, _production) + assert set(result.dims) == {"asset", "region", "technology"} -def test_net_present_value(technologies, _prices, _capacity, _production, year=2030): + +def test_running_costs(_technologies, _prices, _capacity, _production, _consumption): + from muse.costs import running_costs + + result = running_costs(_technologies, _prices, _capacity, _production, _consumption) + assert set(result.dims) == {"asset", "region", "technology"} + + +def test_net_present_value( + _technologies, _prices, _capacity, _production, _consumption +): from muse.costs import net_present_value - result = net_present_value(technologies, _prices, _capacity, _production, year) - assert set(result.dims) == {"asset", "region", "technology", "timeslice", "year"} + result = net_present_value( + _technologies, _prices, _capacity, _production, _consumption + ) + assert set(result.dims) == {"asset", "region", "technology"} -def test_net_present_cost(technologies, _prices, _capacity, _production, year=2030): +def test_net_present_cost(_technologies, _prices, _capacity, _production, _consumption): from muse.costs import net_present_cost - result = net_present_cost(technologies, _prices, _capacity, _production, year) - assert set(result.dims) == {"asset", "region", "technology", "timeslice", "year"} + result = net_present_cost( + _technologies, _prices, _capacity, _production, _consumption + ) + assert set(result.dims) == {"asset", "region", "technology"} def test_equivalent_annual_cost( - technologies, _prices, _capacity, _production, year=2030 + _technologies, _prices, _capacity, _production, _consumption ): from muse.costs import equivalent_annual_cost - result = equivalent_annual_cost(technologies, _prices, _capacity, _production, year) - assert set(result.dims) == {"asset", "region", "technology", "timeslice", "year"} + result = equivalent_annual_cost( + _technologies, _prices, _capacity, _production, _consumption + ) + assert set(result.dims) == {"asset", "region", "technology"} -def test_lifetime_levelized_cost_of_energy( - technologies, _prices, _capacity, _production, year=2030 +@mark.parametrize("method", ["annual", "lifetime"]) +def test_levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method ): - from muse.costs import lifetime_levelized_cost_of_energy + from muse.costs import levelized_cost_of_energy - result = lifetime_levelized_cost_of_energy( - technologies, _prices, _capacity, _production, year + result = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method ) - assert set(result.dims) == {"asset", "region", "technology", "timeslice", "year"} - + assert set(result.dims) == {"asset", "region", "technology"} -def test_annual_levelized_cost_of_energy(technologies, _prices): - from muse.costs import annual_levelized_cost_of_energy - result = annual_levelized_cost_of_energy(technologies, _prices) - assert set(result.dims) == {"region", "technology", "timeslice", "year"} +def test_supply_cost(_technologies, _prices, _capacity, _production, _consumption): + from muse.costs import levelized_cost_of_energy, supply_cost + from muse.timeslices import broadcast_timeslice - -def test_supply_cost(_production, _prices, technologies): - from muse.costs import annual_levelized_cost_of_energy, supply_cost - - lcoe = annual_levelized_cost_of_energy(technologies, _prices) - result = supply_cost(_production, lcoe) + lcoe = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method="annual" + ) + result = supply_cost(_production, broadcast_timeslice(lcoe)) assert set(result.dims) == { "commodity", "region", "technology", "timeslice", - "year", } -def test_capital_recovery_factor(technologies): +def test_capital_recovery_factor(_technologies): from muse.costs import capital_recovery_factor - result = capital_recovery_factor(technologies) - assert set(result.dims) == {"region", "technology", "year"} + result = capital_recovery_factor(_technologies) + assert set(result.dims) == set(_technologies.interest_rate.dims) + # {"region", "technology"} + + +def test_annual_to_lifetime(_technologies, _prices, _consumption): + from muse.costs import annual_to_lifetime, fuel_costs + + _fuel_costs = fuel_costs(_technologies, _prices, _consumption).sum("timeslice") + _fuel_costs_lifetime = annual_to_lifetime(_fuel_costs, _technologies) + assert set(_fuel_costs.dims) == set(_fuel_costs_lifetime.dims) + assert (_fuel_costs_lifetime > _fuel_costs).all() + + +@mark.parametrize("method", ["annual", "lifetime"]) +def test_lcoe_flow_scaling( + _technologies, _prices, _capacity, _production, _consumption, method +): + """Testing that LCOE is independent of input/output flow scaling. + + In other words, if we change technology flows by a constant factor, the LCOE (which + is a cost per unit of production) should remain unchanged. + + This is a bit more complicated if the variable costs are nonlinear, so we'll set + the exponent to 1 for simplicity. + """ + from muse.costs import levelized_cost_of_energy + + _technologies["var_exp"] = 1 + + # LCOE with original inputs + lcoe1 = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method + ) + + # Scale inputs and outputs by a constant factor -> LCOE should be unchanged + # var_par also needs to be scaled as this relates to units of technology + # activity, not units of commodity consumption/production + _technologies_scaled = _technologies.copy() + _technologies_scaled["fixed_inputs"] = _technologies["fixed_inputs"] * 2 + _technologies_scaled["flexible_inpits"] = _technologies["flexible_inputs"] * 2 + _technologies_scaled["fixed_outputs"] = _technologies["fixed_outputs"] * 2 + _technologies_scaled["var_par"] = _technologies["var_par"] * 2 + lcoe2 = levelized_cost_of_energy( + _technologies_scaled, + _prices, + _capacity, + _production, + _consumption, + method=method, + ) + assert isclose(lcoe1, lcoe2).all() + + +@mark.parametrize("method", ["annual", "lifetime"]) +def test_lcoe_prod_scaling( + _technologies, _prices, _capacity, _production, _consumption, method +): + """Testing that LCOE is independent of production scaling. + + If all costs are linear (exponents = 1), then the LCOE should be independent of + production as long as production, consumption, and capacity are scaled together. + """ + from muse.costs import levelized_cost_of_energy + + _technologies["var_exp"] = 1 + _technologies["cap_exp"] = 1 + _technologies["fix_exp"] = 1 + + # LCOE with original inputs + lcoe1 = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method + ) + + # Scale consumption, production, and capacity by a constant factor -> LCOE + # should be unchanged + lcoe2 = levelized_cost_of_energy( + _technologies, + _prices, + _capacity * 2, + _production * 2, + _consumption * 2, + method=method, + ) + assert isclose(lcoe1, lcoe2).all() diff --git a/tests/test_objectives.py b/tests/test_objectives.py index 5727df2d2..9f56aadc5 100644 --- a/tests/test_objectives.py +++ b/tests/test_objectives.py @@ -186,28 +186,28 @@ def test_lifetime_levelized_cost_of_energy(_technologies, _demand, _prices): from muse.objectives import lifetime_levelized_cost_of_energy result = lifetime_levelized_cost_of_energy(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_net_present_value(_technologies, _demand, _prices): from muse.objectives import net_present_value result = net_present_value(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_net_present_cost(_technologies, _demand, _prices): from muse.objectives import net_present_cost result = net_present_cost(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_equivalent_annual_cost(_technologies, _demand, _prices): from muse.objectives import equivalent_annual_cost result = equivalent_annual_cost(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def add_var(coordinates, *dims, factor=100.0):