diff --git a/docs/inputs/projections.rst b/docs/inputs/projections.rst index 919f370d..0452090d 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 c935d740..0fcadea0 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,19.7496,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 7283f612..8dc0e762 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,19.7496,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 5ad9b6d8..358f0f78 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,11.8414,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,11.8414,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,11.8414,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,11.8414,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,11.8414,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,11.8414,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.1996,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 6081d775..2928ae6d 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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 bd532609..61ec07d3 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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 44ca7854..176ec59b 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,20.1973,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 88431f04..0341f245 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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0747,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,11.8409,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,10.0747,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,20.1973,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.4724,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 9fb81127..172678d0 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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0747,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,11.8409,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,10.0747,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,20.1973,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.4724,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 88431f04..0341f245 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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0746,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,11.8409,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,10.0747,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,11.8409,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,10.0747,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,20.1973,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.4724,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 bbd999e3..4b7c2419 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,25.4255,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,25.4255,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,25.4255,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,25.4255,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,25.4255,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,25.4255,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.3529,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 9af633cd..d2d5cc55 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,19.0270,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,11.8409,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,19.0270,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,11.8409,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,19.0270,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,11.8409,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,19.0270,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,11.8409,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,19.0270,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,11.8409,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,19.0270,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,11.8409,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,11.0936,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 95df32cd..5059ff34 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,21.0041,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,11.8409,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,21.0041,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,11.8409,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,21.0041,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,11.8409,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,21.0041,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,11.8409,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,11.8409,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,11.8409,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,11.4949,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 2742e1a6..5c89f6ec 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,11.7988,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,11.7988,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,11.7988,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,11.7988,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,11.7988,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,11.7988,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,11.7988,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,11.7988,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,20.0108,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 4526361d..0da42cfd 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,10.3650,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,10.3650,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,10.3650,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,10.3650,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,10.3650,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,10.3650,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,10.3650,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,10.3650,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 21e5ad05..1a1d1219 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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 badaeb3c..3140cc40 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -330,8 +330,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), @@ -378,10 +383,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 @@ -398,12 +400,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) @@ -473,7 +473,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 d916135e..f129e046 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 043aeb0a..7ffbf50f 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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.6509,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 5ad9b6d8..358f0f78 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,11.8414,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,11.8414,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,11.8414,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,11.8414,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,11.8414,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,11.8414,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.1996,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 8e29dcff..4f3f3ea9 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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 fbd09708..23f077b0 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.3165,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index bf3eb5d9..850afe45 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -1,22 +1,22 @@ asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,CO2f,all-week,night,2020,all-year,r1,5.0928,gasCCGT,0,MUS$2010/kt,2025 0,electricity,all-week,night,2020,all-year,r1,0.0556,gasCCGT,0,MUS$2010/PJ,2025 1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2025 -0,CO2f,all-week,morning,2020,all-year,r1,7.6392,gasCCGT,1,MUS$2010/kt,2025 +0,CO2f,all-week,night,2020,all-year,r1,5.0928,gasCCGT,0,MUS$2010/kt,2025 0,electricity,all-week,morning,2020,all-year,r1,0.0833,gasCCGT,1,MUS$2010/PJ,2025 1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,5.0928,gasCCGT,2,MUS$2010/kt,2025 +0,CO2f,all-week,morning,2020,all-year,r1,7.6392,gasCCGT,1,MUS$2010/kt,2025 0,electricity,all-week,afternoon,2020,all-year,r1,0.0556,gasCCGT,2,MUS$2010/PJ,2025 1,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,7.6392,gasCCGT,3,MUS$2010/kt,2025 +0,CO2f,all-week,afternoon,2020,all-year,r1,5.0928,gasCCGT,2,MUS$2010/kt,2025 0,electricity,all-week,early-peak,2020,all-year,r1,0.0833,gasCCGT,3,MUS$2010/PJ,2025 1,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,MUS$2010/kt,2025 +0,CO2f,all-week,early-peak,2020,all-year,r1,7.6392,gasCCGT,3,MUS$2010/kt,2025 0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,MUS$2010/PJ,2025 1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2025 -0,CO2f,all-week,evening,2020,all-year,r1,10.1856,gasCCGT,5,MUS$2010/kt,2025 +0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,MUS$2010/kt,2025 0,electricity,all-week,evening,2020,all-year,r1,0.1111,gasCCGT,5,MUS$2010/PJ,2025 1,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2025 +0,CO2f,all-week,evening,2020,all-year,r1,10.1856,gasCCGT,5,MUS$2010/kt,2025 1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2030 2,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2030 1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 0b4eb059..9b1fe426 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,11.8475,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,11.8475,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,11.8475,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,11.8475,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,11.8475,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,11.8475,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,28.3773,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 5df6205d..765b08e4 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,397.8624,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,397.8624,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,397.8624,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 04bd3a0f..935dc574 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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,11.8409,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,28.3773,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/run_models.py b/tests/example_outputs/run_models.py index 3583be9e..9fad7ada 100644 --- a/tests/example_outputs/run_models.py +++ b/tests/example_outputs/run_models.py @@ -6,6 +6,8 @@ from muse.examples import AVAILABLE_EXAMPLES, model +parent_path = Path(__file__).parent + def run_model(name: str) -> Union[str, None]: """Run a model with the specified settings file. @@ -16,20 +18,23 @@ def run_model(name: str) -> Union[str, None]: Returns: Error message for failed runs, otherwise None. """ + prev_cwd = Path.cwd() + run_dir = parent_path / name try: # Prepare results folder - folder_path = Path(name) - if folder_path.exists(): - shutil.rmtree(folder_path) - folder_path.mkdir() + if run_dir.exists(): + shutil.rmtree(run_dir) + run_dir.mkdir() # Run model - os.chdir(folder_path) + os.chdir(run_dir) m = model(name) m.run() return None except Exception as e: return f"Failed to run model {name}. Error: {e}" + finally: + os.chdir(prev_cwd) if __name__ == "__main__": diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index ffecb4e4..be65f99b 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -1,7 +1,7 @@ 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,11.2701,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8176,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 @@ -10,8 +10,8 @@ heat,all-week,night,all-year,0.0000,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,11.2701,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8176,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 @@ -20,8 +20,8 @@ heat,all-week,morning,all-year,0.0000,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,11.2701,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8176,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 @@ -30,8 +30,8 @@ heat,all-week,afternoon,all-year,0.0000,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,11.2701,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8176,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 @@ -40,8 +40,8 @@ heat,all-week,early-peak,all-year,0.0000,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,11.2701,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8176,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 @@ -50,8 +50,8 @@ heat,all-week,late-peak,all-year,0.0000,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,11.2701,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8176,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