diff --git a/docs/inputs/projections.rst b/docs/inputs/projections.rst index 919f370dc..0452090de 100644 --- a/docs/inputs/projections.rst +++ b/docs/inputs/projections.rst @@ -10,19 +10,32 @@ The interpretation of these prices depends on the type of commodity: the monetary cost of purchasing the commodity. Whether a price projection is required or not depends on the processes in the model and the simulation settings: - * For commodities that are **produced by processes in the model**, prices do not need to - be provided as they are calculated endogenously by the model in all years after the - base year, so long as the model is in equilibrium mode. Equilibrium mode is active - as long as the ``maximum_iterations`` parameter in the settings file is greater than 1. - * For commodities that are **not produced by processes in the model**, and are not free, prices should be - provided for all years as they cannot be endogenously calculated. + * For commodities that are **produced by processes in the model**, the behaviour + depends on the simulation mode: + + * In equilibrium mode (``maximum_iterations > 1``), price projections are **optional**. + If not provided, prices are initialised to zero for all years. + Once the commodity is produced, its price is calculated endogenously for that year + and carried forward to subsequent years until updated again. + Until the first time a commodity is produced, the price remains at the projected value + (or zero if no projection is provided). + **Note:** because prices are updated during intermediate iterations, a commodity may + retain a previously calculated price even if it is not produced in the final converged solution. + + * Outside equilibrium mode (``maximum_iterations = 1``), prices are **not** calculated + endogenously, so projections are required for all years. Any missing values will be + interpreted as zero (i.e. no cost to purchase). + + * For commodities that are **not produced by processes in the model**, and are not free, + prices should be provided for all years as they cannot be endogenously calculated. + Lack of a price trajectory will be interpreted as a price of 0 for all periods (i.e. no cost to purchase). * For **environmental** commodities, prices represent levies on production (e.g. carbon tax). In most cases, these will not be calculated endogenously, so users should provide full price trajectories. The exception is when using the carbon budget mode, where the prices of environmental commodities may be updated throughout the simulation. - -Lack of a price trajectory for any commodity will be interpreted as a price of 0 for all periods (i.e. no cost to purchase, and no levy on production), again with the exception of the carbon budget mode. + Lack of a price trajectory will be interpreted as a price of 0 for all periods (i.e. no levy on production), + again with the exception of the carbon budget mode. Price trajectories should be stored in a CSV file with the structure shown in the table below, and referenced from the TOML settings file using the ``projections`` key. 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 b3747ab2c..043197472 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 @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,14.0010,r1,0,MUS$2010/PJ,2025 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 f63e99024..cba93dea5 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 @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,14.0010,r1,0,MUS$2010/PJ,2025 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 c07d14c17..3ca816672 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 @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.1284,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.1284,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.1284,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.1284,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.1284,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.1284,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.8703,r1,0,MUS$2010/PJ,2025 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 b93425aaa..f6c615adb 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 @@ -1,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 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 687b9a691..24615298c 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 @@ -1,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 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 99baf8955..b0cce0c02 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 @@ -1,62 +1,62 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.5000,r2,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r2,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r2,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r2,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r2,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r2,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r2,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r2,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r2,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r2,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r2,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r2,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r2,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r2,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r2,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r2,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r2,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r2,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r2,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r2,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r2,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r2,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r2,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r2,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv index 621b8442b..a5c076953 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv @@ -1,40 +1,40 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,7.8572,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,7.8572,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,7.8572,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,7.8572,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,7.8572,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +cook,all-week,evening,all-year,7.8572,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,19.6620,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.4046,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv index ad556edbd..c117dd2f8 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv @@ -1,40 +1,40 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,7.8572,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,7.8572,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,7.8572,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,7.8572,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,7.8572,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +cook,all-week,evening,all-year,7.8572,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.5298,r1,0,MUS$2010/PJ,2025 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 621b8442b..a5c076953 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 @@ -1,40 +1,40 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,7.8572,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,7.8572,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,7.8572,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,7.8572,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,7.8572,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +cook,all-week,evening,all-year,7.8572,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,19.6620,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.4046,r1,0,MUS$2010/PJ,2025 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 b12cf3a6d..691503bf5 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 @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,13.9023,r1,0,MUS$2010/PJ,2025 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 a2de37c7f..60814470c 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 @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,16.2318,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,16.2318,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,16.2318,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,16.2318,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,16.2318,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,16.2318,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,9.8410,r1,0,MUS$2010/PJ,2025 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 0b297191e..8b149e804 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 @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,17.4285,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,17.4285,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,17.4285,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,17.4285,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,10.4968,r1,0,MUS$2010/PJ,2025 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 26590c0a1..ad0becd9c 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 @@ -1,42 +1,42 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0743,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0743,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,mid-afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,mid-afternoon,all-year,9.0743,r1,2,MUS$2010/PJ,2020 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,mid-afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0743,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0743,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0743,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,early-morning,all-year,19.5000,r1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.1528,r1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 +gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2020 +heat,all-week,early-morning,all-year,9.0743,r1,6,MUS$2010/PJ,2020 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 CO2f,all-week,early-morning,all-year,0.0831,r1,6,MUS$2010/kt,2020 electricity,all-week,late-afternoon,all-year,19.5000,r1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.1528,r1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 +gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2020 +heat,all-week,late-afternoon,all-year,9.0743,r1,7,MUS$2010/PJ,2020 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.0831,r1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.4630,r1,0,MUS$2010/PJ,2025 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 dcc3b8503..439675060 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 @@ -1,42 +1,42 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0743,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0743,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,mid-afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,mid-afternoon,all-year,9.0743,r1,2,MUS$2010/PJ,2020 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,mid-afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0743,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0743,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0743,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,early-morning,all-year,19.5000,r1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.1528,r1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 +gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2020 +heat,all-week,early-morning,all-year,9.0743,r1,6,MUS$2010/PJ,2020 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 CO2f,all-week,early-morning,all-year,0.0831,r1,6,MUS$2010/kt,2020 electricity,all-week,late-afternoon,all-year,19.5000,r1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.1528,r1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 +gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2020 +heat,all-week,late-afternoon,all-year,9.0743,r1,7,MUS$2010/PJ,2020 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.0831,r1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,26.3034,r1,0,MUS$2010/PJ,2022 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index 21e5ad055..5dc558783 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -1,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 diff --git a/src/muse/mca.py b/src/muse/mca.py index 183bedafc..7627d23d4 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -332,8 +332,13 @@ def run(self) -> None: self.market.supply.loc[dims] = new_market.supply self.market.consumption.loc[dims] = new_market.consumption - # Update prices + # Update prices for the investment year + # In the first iteration we also update prices for the first year dims = {i: new_market[i] for i in new_market.prices.dims if i != "year"} + if year_idx == 0: + self.market.prices.loc[{**dims, "year": current_year}] = ( + new_market.prices.sel(year=current_year) + ) self.market.prices.loc[dims] = future_propagation( self.market.prices.sel(dims), new_market.prices.sel(year=investment_year), @@ -380,10 +385,7 @@ def single_year_iteration( sectors = deepcopy(sectors) market = market.copy(deep=True) - - # New prices for the investment year - investment_year = market.year[1] - updated_prices = market.prices.sel(year=investment_year) + updated_prices = market.prices.copy(deep=True) for sector in sectors: # Solve the sector @@ -400,12 +402,10 @@ def single_year_iteration( # Update market prices # We only do this for the commodities that the sector is in charge of producing - # And only for regions/timeslices with >0 production in the investment year - supply = sector_market.supply.sel(year=investment_year) + # And only for regions/timeslices with >0 production + supply = sector_market.supply supply = supply.where(supply.commodity.isin(sector.commodities), 0) - updated_prices = updated_prices.where( - supply == 0, sector_market.costs.sel(year=investment_year) - ) + updated_prices = updated_prices.where(supply == 0, sector_market.costs) return SingleYearIterationResult(market, sectors, updated_prices) @@ -475,7 +475,7 @@ def find_equilibrium( break # Update prices - market["prices"].loc[dict(year=investment_year)] = updated_prices + market["prices"].loc[:] = updated_prices # Check convergence converged = check_equilibrium( diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 28f45bcec..2f4943921 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 1e0a6f311..801bb16e4 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,13.9023,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_correlation/Results/MCAPrices.csv b/tests/example_outputs/default_correlation/Results/MCAPrices.csv index c07d14c17..3ca816672 100644 --- a/tests/example_outputs/default_correlation/Results/MCAPrices.csv +++ b/tests/example_outputs/default_correlation/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.1284,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.1284,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.1284,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.1284,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.1284,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.1284,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.8703,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 8e29dcff8..11cfc4ca1 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 218908a22..427192e8b 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,5.3588,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index d0e488140..731c928da 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -1,38 +1,38 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/GWh,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 -cook,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.4580,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/GWh,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 -cook,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.4580,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/GWh,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 -cook,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.4580,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/GWh,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 -cook,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.4580,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/GWh,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 -cook,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.4580,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/GWh,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.4580,r1,5,MUS$2010/PJ,2020 +cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,24.2058,r1,0,MUS$2010/GWh,2025 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 5df6205d7..a18e90924 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -2,7 +2,7 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year fuel1,all-week,all-day,winter,1.0000,r1,0,MUS$2010/PJ,2010 fuel2,all-week,all-day,winter,9.5512,r1,0,MUS$2010/PJ,2010 fuel3,all-week,all-day,winter,0.0533,r1,0,MUS$2010/PJ,2010 -ammonia,all-week,all-day,winter,0.0000,r1,0,MUS$2010/Mt,2010 +ammonia,all-week,all-day,winter,373.3042,r1,0,MUS$2010/Mt,2010 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 @@ -11,7 +11,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 fuel1,all-week,all-day,summer,1.0000,r1,1,MUS$2010/PJ,2010 fuel2,all-week,all-day,summer,9.5512,r1,1,MUS$2010/PJ,2010 fuel3,all-week,all-day,summer,0.0533,r1,1,MUS$2010/PJ,2010 -ammonia,all-week,all-day,summer,0.0000,r1,1,MUS$2010/Mt,2010 +ammonia,all-week,all-day,summer,373.3042,r1,1,MUS$2010/Mt,2010 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 @@ -20,7 +20,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 fuel1,all-week,all-day,spring-autumn,1.0000,r1,2,MUS$2010/PJ,2010 fuel2,all-week,all-day,spring-autumn,9.5512,r1,2,MUS$2010/PJ,2010 fuel3,all-week,all-day,spring-autumn,0.0533,r1,2,MUS$2010/PJ,2010 -ammonia,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/Mt,2010 +ammonia,all-week,all-day,spring-autumn,373.3042,r1,2,MUS$2010/Mt,2010 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 657e63ac9..558ebcb07 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,24.2058,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index ffecb4e40..ba9f9fa47 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -1,62 +1,62 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,13.9815,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,4.7168,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,10.7721,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.1464,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0000,r1,0,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.1389,r2,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,4.7168,r2,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,11.7559,r2,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,14.1655,r2,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0000,r2,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,13.9815,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,4.7168,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,10.7721,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.1464,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0000,r1,1,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.1389,r2,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,4.7168,r2,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,11.7559,r2,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,14.1655,r2,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0000,r2,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,13.9815,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,4.7168,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,10.7721,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.1464,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.1389,r2,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,4.7168,r2,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,11.7559,r2,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,14.1655,r2,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,13.9815,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,4.7168,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,10.7721,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.1464,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.1389,r2,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,4.7168,r2,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,11.7559,r2,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,14.1655,r2,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,13.9815,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,4.7168,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,10.7721,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.1464,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.1389,r2,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,4.7168,r2,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,11.7559,r2,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,14.1655,r2,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,13.9815,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,4.7168,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,10.7721,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.1464,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0000,r1,5,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.1389,r2,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,4.7168,r2,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,11.7559,r2,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,14.1655,r2,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0000,r2,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.9956,r1,0,MUS$2010/PJ,2025