diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb index 27048ba2c..5734aadcc 100644 --- a/docs/advanced-guide/extending-muse.ipynb +++ b/docs/advanced-guide/extending-muse.ipynb @@ -100,6 +100,7 @@ "def consumption_zero(\n", " market: Dataset,\n", " capacity: DataArray,\n", + " **kwargs,\n", "):\n", " \"\"\"Current consumption.\"\"\"\n", " result = (\n", @@ -300,6 +301,7 @@ "def capacity(\n", " cached: list[xr.DataArray],\n", " agents: MutableMapping[str, MutableMapping[str, str]],\n", + " **kwargs,\n", ") -> pd.DataFrame:\n", " \"\"\"Consolidates the cached capacity into a single DataFrame to save.\n", "\n", @@ -307,6 +309,7 @@ " cached (list[xr.DataArray]): The list of cached arrays during the calculation of\n", " the time period with the capacity.\n", " agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata.\n", + " kwargs: unused.\n", "\n", " Returns:\n", " pd.DataFrame: DataFrame with the consolidated data for retro agents.\n", @@ -457,6 +460,7 @@ " sum_over: Optional[list[str]] = None,\n", " drop: Optional[list[str]] = None,\n", " rounding: int = 4,\n", + " **kwargs,\n", "):\n", " \"\"\"Current consumption.\"\"\"\n", " result = (\n", @@ -652,6 +656,11 @@ "source": [ "In the next section we will output a technology filter, to stop agents from investing in a certain technology, and a new metric to combine multiple objectives." ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [] } ], "metadata": { diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv index ea0c8ef96..d3f0aeb81 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv @@ -91,3 +91,30 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index 7964d0a1e..94c5c0571 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 @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index ea0c8ef96..08471d84e 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -91,3 +91,28 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 7964d0a1e..ba2ac2718 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 @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 0f784f8f5..0c2b73d2f 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv @@ -38,3 +38,13 @@ A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index 618937468..f806474f7 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index 593bcae69..d0767bf6a 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,22.75000000000,R1,2050,R1,power,solarPV,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index 8be0b1287..46b6e12bb 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 9397c720e..1d0a03115 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv @@ -43,3 +43,13 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,solarPV,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index 96680e9a7..5147a8c94 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 @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,24.10890000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.24100000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,25.01660000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.60410000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,25.01660000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.60410000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,25.01660000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,12.60410000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,25.01660000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.60410000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,25.01660000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.60410000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,25.01660000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.60410000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 255cc0ec0..960a24355 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv @@ -99,3 +99,27 @@ A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2045 A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2045 A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 +A1,22.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050 +A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 +A1,1.00000000000,R2,2050,R2,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2050 +A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2050 +A1,1.91410000000,R2,2050,R2,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2050 +A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2050 +A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R2,2050,R2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 14c564667..b9ced2d02 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 @@ -287,3 +287,51 @@ heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,22.74000000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,41.05480000000,R2,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,27.33660000000,R2,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,41.05480000000,R2,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,27.33660000000,R2,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,41.05480000000,R2,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,27.33660000000,R2,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,41.05480000000,R2,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,27.33660000000,R2,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,41.05480000000,R2,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,27.33660000000,R2,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,41.05480000000,R2,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,27.33660000000,R2,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index c8b104bfe..5012430c6 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -54,3 +54,15 @@ A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,electric_stove,newcapa,2050 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,32.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index f4b0bf1b4..bf7c1af91 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv @@ -179,3 +179,33 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,22.26920000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +cook,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,22.26920000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +cook,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,22.26920000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +cook,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,22.26920000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +cook,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,22.26920000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +cook,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,22.26920000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +cook,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv index 357e67807..c0aced739 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv @@ -13,3 +13,10 @@ A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2030 A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index a7505cb8c..c5d5c2055 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv @@ -71,3 +71,27 @@ electricity,all-week,evening,all-year,18.96750000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,10.18440000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,21.16800000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.06460000000,R1,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,21.16800000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.06460000000,R1,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,21.16800000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.06460000000,R1,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,21.16800000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.06460000000,R1,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,21.16800000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.06460000000,R1,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,21.16800000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.06460000000,R1,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,0.19000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv index 27166a56d..f1a5fe685 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv @@ -65,3 +65,27 @@ electricity,all-week,evening,all-year,R1,1.33330000000,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,R1,0.80000000000,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,R1,0.49170000000,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,R1,26.99170000000,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,R1,1.20000000000,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,R1,0.73760000000,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,R1,40.48760000000,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,R1,0.80000000000,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,R1,0.49170000000,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,R1,26.99170000000,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,R1,1.20000000000,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,R1,0.73760000000,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,R1,2.40000000000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,R1,1.47520000000,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,R1,6.00000000000,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,R1,80.97520000000,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,R1,1.60000000000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index 4cc29c1f0..fb43c23d0 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index 9c7ec3faa..c3a1eb9c9 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index 18ed2f4cb..282fa0e44 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -29,18 +29,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -113,3 +113,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index 48b275d9e..7d122ba67 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 336d4aa92..6e9e1ba96 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 1e62a502c..5aec78050 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -25,18 +25,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -109,3 +109,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.52780000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.79170000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.52780000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.79170000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.58330000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.05560000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 25cfe1164..b57a8cc6a 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -51,3 +51,15 @@ A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,21.80000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,5.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 2aa26615c..8062d64f0 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -191,3 +191,35 @@ electricity,all-week,late-afternoon,all-year,31.11670000000,R1,7,MUS$2010/PJ,204 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 heat,all-week,late-afternoon,all-year,14.94590000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 +electricity,all-week,night,all-year,33.36640000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.84580000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,33.36640000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,15.84580000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,mid-afternoon,all-year,33.36640000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,15.84580000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,33.36640000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,15.84580000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,33.36640000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.84580000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,33.36640000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,15.84580000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +electricity,all-week,early-morning,all-year,33.36640000000,R1,6,MUS$2010/PJ,2050 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,15.84580000000,R1,6,MUS$2010/PJ,2050 +CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 +electricity,all-week,late-afternoon,all-year,33.36640000000,R1,7,MUS$2010/PJ,2050 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,15.84580000000,R1,7,MUS$2010/PJ,2050 +CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index a6805883c..a1cf35c01 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -138,3 +138,26 @@ A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2038 +A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2040 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2040 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2040 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2040 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 +A1,1.50000000000,R1,2036,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 7b7db94e1..bcd61a467 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -319,3 +319,35 @@ electricity,all-week,late-afternoon,all-year,25.52450000000,R1,7,MUS$2010/PJ,203 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 heat,all-week,late-afternoon,all-year,12.70910000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 +electricity,all-week,night,all-year,26.18290000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.97240000000,R1,0,MUS$2010/PJ,2040 +CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 +electricity,all-week,morning,all-year,26.18290000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.97240000000,R1,1,MUS$2010/PJ,2040 +CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 +electricity,all-week,mid-afternoon,all-year,26.18290000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.97240000000,R1,2,MUS$2010/PJ,2040 +CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 +electricity,all-week,early-peak,all-year,26.18290000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.97240000000,R1,3,MUS$2010/PJ,2040 +CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 +electricity,all-week,late-peak,all-year,26.18290000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.97240000000,R1,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 +electricity,all-week,evening,all-year,26.18290000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.97240000000,R1,5,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 +electricity,all-week,early-morning,all-year,26.18290000000,R1,6,MUS$2010/PJ,2040 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.97240000000,R1,6,MUS$2010/PJ,2040 +CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 +electricity,all-week,late-afternoon,all-year,26.18290000000,R1,7,MUS$2010/PJ,2040 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.97240000000,R1,7,MUS$2010/PJ,2040 +CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 63229b23f..2a91c624e 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -47,3 +47,14 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,10.00000000000,R1,2050,R1,power,solarPV,newcapa,2050 +A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,9.40130000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index ea92faa3c..811f907ed 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,17.17320000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,9.46670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,17.72660000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.68810000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,17.72660000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.68810000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,17.72660000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.68810000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,17.72660000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.68810000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,17.72660000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.68810000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,17.72660000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.68810000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/src/muse/mca.py b/src/muse/mca.py index 995b5f65b..6c029e167 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -279,11 +279,13 @@ def run(self) -> None: variables = ["supply", "consumption", "prices"] for year_idx in range(nyear): - years = self.time_framework[year_idx : year_idx + 2] + current_year, investment_year = self.time_framework[year_idx : year_idx + 2] getLogger(__name__).info( - f"Running simulation years {years[0]} to {years[1]}" + f"Running simulation years {current_year} to {investment_year}" + ) + new_market = self.market[variables].sel( + year=[current_year, investment_year] ) - new_market = self.market[variables].sel(year=years) assert isinstance(new_market, Dataset) new_market.supply[:] = 0 new_market.consumption[:] = 0 @@ -291,7 +293,7 @@ def run(self) -> None: # If we need to account for the carbon budget, we do it now. if check_carbon_budget: new_price = self.update_carbon_price(new_market) - future_price = DataArray(new_price, coords=dict(year=years[1])) + future_price = DataArray(new_price, coords=dict(year=investment_year)) new_market.prices.loc[dict(commodity=self.carbon_commodities)] = ( future_propagation( new_market.prices.sel(commodity=self.carbon_commodities), @@ -303,10 +305,13 @@ def run(self) -> None: # Solve the market _, new_market, self.sectors = self.find_equilibrium(new_market) - # Save sector outputs + # Save sector outputs for the investment year + # In the first iteration we also save outputs for the first year for sector in self.sectors: if type(sector) is Sector: - sector.save_outputs() + if year_idx == 0: + sector.save_outputs(current_year) + sector.save_outputs(investment_year) # If we need to account for the carbon budget, we might need to change # the budget for the future, too. @@ -321,15 +326,20 @@ def run(self) -> None: self.market.consumption.loc[dims] = new_market.consumption dims = {i: new_market[i] for i in new_market.prices.dims if i != "year"} self.market.prices.loc[dims] = future_propagation( - self.market.prices.sel(dims), new_market.prices.sel(year=years[1]) + self.market.prices.sel(dims), + new_market.prices.sel(year=investment_year), ) - # Global outputs - self.outputs(self.market, self.sectors, year=self.time_framework[year_idx]) # type: ignore - self.outputs_cache.consolidate_cache(year=self.time_framework[year_idx]) + # Global outputs for the investment year + # In the first iteration we also save outputs for the first year + if year_idx == 0: + self.outputs(self.market, self.sectors, year=current_year) + self.outputs(self.market, self.sectors, year=investment_year) + self.outputs_cache.consolidate_cache(year=current_year) + # TODO: change cache to investment_year (not working properly anyway) getLogger(__name__).info( - f"Finished simulation period {years[0]} to {years[1]} " + f"Finished simulation period {current_year} to {investment_year} " f"({year_idx + 1}/{nyear})!" ) diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py index 71712cd95..5f77aa706 100644 --- a/src/muse/outputs/cache.py +++ b/src/muse/outputs/cache.py @@ -354,7 +354,7 @@ def extract_agents_internal( info[aid]["category"] = agent.category info[aid]["sector"] = sector_name info[aid]["dst_region"] = agent.region - info[aid]["year"] = agent.forecast_year + info[aid]["year"] = agent.year info[aid]["installed"] = agent.year return info @@ -439,12 +439,14 @@ def consolidate_quantity( def capacity( cached: list[xr.DataArray], agents: MutableMapping[str, MutableMapping[str, str]], + **kwargs, ) -> pd.DataFrame: """Consolidates the cached capacities into a single DataFrame to save. Args: cached (List[xr.DataArray]): The list of cached arrays agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata. + kwargs: unused. Returns: pd.DataFrame: DataFrame with the consolidated data. @@ -456,12 +458,14 @@ def capacity( def production( cached: list[xr.DataArray], agents: MutableMapping[str, MutableMapping[str, str]], + **kwargs, ) -> pd.DataFrame: """Consolidates the cached production into a single DataFrame to save. Args: cached (List[xr.DataArray]): The list of cached arrays agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata. + kwargs: unused. Returns: pd.DataFrame: DataFrame with the consolidated data. @@ -473,12 +477,14 @@ def production( def lcoe( cached: list[xr.DataArray], agents: MutableMapping[str, MutableMapping[str, str]], + **kwargs, ) -> pd.DataFrame: """Consolidates the cached LCOE into a single DataFrame to save. Args: cached (List[xr.DataArray]): The list of cached arrays agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata. + kwargs: unused. Returns: pd.DataFrame: DataFrame with the consolidated data. diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index 966c1c170..6c32dc3ba 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -8,7 +8,9 @@ @register_output_quantity def quantity( sectors: List[AbstractSector], - market: xr.Dataset, **kwargs + market: xr.Dataset, + year: int, + **kwargs ) -> Union[pd.DataFrame, xr.DataArray]: pass @@ -76,9 +78,13 @@ def round_values(function: Callable) -> OUTPUT_QUANTITY_SIGNATURE: @wraps(function) def rounded( - market: xr.Dataset, sectors: list[AbstractSector], rounding: int = 4, **kwargs + market: xr.Dataset, + sectors: list[AbstractSector], + year: int, + rounding: int = 4, + **kwargs, ) -> xr.DataArray: - result = function(market, sectors, **kwargs) + result = function(market=market, sectors=sectors, year=year, **kwargs) if hasattr(result, "to_dataframe"): result = result.to_dataframe() @@ -150,7 +156,7 @@ def reformat_finite_resources(params): @register_output_quantity @round_values def consumption( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current consumption.""" return market_quantity(market.consumption, **kwargs).to_dataframe().reset_index() @@ -158,7 +164,9 @@ def consumption( @register_output_quantity @round_values -def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> pd.DataFrame: +def supply( + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs +) -> pd.DataFrame: """Current supply.""" return market_quantity(market.supply, **kwargs).to_dataframe().reset_index() @@ -168,6 +176,7 @@ def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> pd.Da def prices( market: xr.Dataset, sectors: list[AbstractSector], + year: int, **kwargs, ) -> pd.DataFrame: """Current MCA market prices.""" @@ -177,7 +186,7 @@ def prices( @register_output_quantity @round_values def capacity( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current capacity across all sectors.""" return _aggregate_sectors(sectors, op=sector_capacity) @@ -236,14 +245,14 @@ def _aggregate_sectors( @register_output_quantity(name=["fuel_costs"]) def metric_fuel_costs( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current fuel costs across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_fuel_costs) + return _aggregate_sectors(sectors, market, year, op=sector_fuel_costs) def sector_fuel_costs( - sector: AbstractSector, market: xr.Dataset, **kwargs + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs ) -> pd.DataFrame: """Sector fuel costs with agent annotations.""" from muse.commodities import is_fuel @@ -257,15 +266,14 @@ def sector_fuel_costs( agent_market = market.copy() if len(technologies) > 0: for a in agents: - output_year = a.year - a.forecast agent_market["consumption"] = (market.consumption * a.quantity).sel( - year=output_year + year=year ) commodity = is_fuel(technologies.comm_usage) capacity = a.filter_input( a.assets.capacity, - year=output_year, + year=year, ).fillna(0.0) production = supply( @@ -274,7 +282,7 @@ def sector_fuel_costs( technologies, ) - prices = a.filter_input(market.prices, year=output_year) + prices = a.filter_input(market.prices, year=year) fcons = consumption( technologies=technologies, production=production, prices=prices ) @@ -283,7 +291,7 @@ def sector_fuel_costs( data_agent["agent"] = a.name data_agent["category"] = a.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = year data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "fuel_consumption_costs" ) @@ -299,14 +307,14 @@ def sector_fuel_costs( @register_output_quantity(name=["capital_costs"]) def metric_capital_costs( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current capital costs across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_capital_costs) + return _aggregate_sectors(sectors, market, year, op=sector_capital_costs) def sector_capital_costs( - sector: AbstractSector, market: xr.Dataset, **kwargs + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs ) -> pd.DataFrame: """Sector capital costs with agent annotations.""" data_sector: list[xr.DataArray] = [] @@ -315,18 +323,17 @@ def sector_capital_costs( if len(technologies) > 0: for a in agents: - output_year = a.year - a.forecast - capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0) + capacity = a.filter_input(a.assets.capacity, year=year).fillna(0.0) data = a.filter_input( technologies[["cap_par", "cap_exp"]], - year=output_year, + year=year, technology=capacity.technology, ) data_agent = distribute_timeslice(data.cap_par * (capacity**data.cap_exp)) data_agent["agent"] = a.name data_agent["category"] = a.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = year data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "capital_costs" ) @@ -342,14 +349,14 @@ def sector_capital_costs( @register_output_quantity(name=["emission_costs"]) def metric_emission_costs( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current emission costs across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_emission_costs) + return _aggregate_sectors(sectors, market, year, op=sector_emission_costs) def sector_emission_costs( - sector: AbstractSector, market: xr.Dataset, **kwargs + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs ) -> pd.DataFrame: """Sector emission costs with agent annotations.""" from muse.commodities import is_enduse, is_pollutant @@ -362,23 +369,22 @@ def sector_emission_costs( agent_market = market.copy() if len(technologies) > 0: for a in agents: - output_year = a.year - a.forecast agent_market["consumption"] = (market.consumption * a.quantity).sel( - year=output_year + year=year ) - capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0) + capacity = a.filter_input(a.assets.capacity, year=year).fillna(0.0) allemissions = a.filter_input( technologies.fixed_outputs, commodity=is_pollutant(technologies.comm_usage), technology=capacity.technology, - year=output_year, + year=year, ) envs = is_pollutant(technologies.comm_usage) enduses = is_enduse(technologies.comm_usage) i = (np.where(envs))[0][0] red_envs = envs[i].commodity.values - prices = a.filter_input(market.prices, year=output_year, commodity=red_envs) + prices = a.filter_input(market.prices, year=year, commodity=red_envs) production = supply( agent_market, capacity, @@ -390,7 +396,7 @@ def sector_emission_costs( data_agent["agent"] = a.name data_agent["category"] = a.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = year data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "emission_costs" ) @@ -407,13 +413,15 @@ def sector_emission_costs( @register_output_quantity(name=["LCOE"]) def metric_lcoe( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current lifetime levelised cost across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_lcoe) + return _aggregate_sectors(sectors, market, year, op=sector_lcoe) -def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame: +def sector_lcoe( + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs +) -> pd.DataFrame: """Levelized cost of energy () of technologies over their lifetime.""" from muse.costs import levelized_cost_of_energy as LCOE from muse.quantities import capacity_to_service_demand, consumption @@ -427,8 +435,7 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data agents = retro if len(retro) > 0 else new if len(technologies) > 0: for agent in agents: - output_year = agent.year - agent.forecast - agent_market = market.sel(year=output_year).copy() + agent_market = market.sel(year=agent.year).copy() agent_market["consumption"] = agent_market.consumption * agent.quantity included = [ i @@ -439,16 +446,15 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data i for i in agent_market["commodity"].values if i not in included ] agent_market.loc[dict(commodity=excluded)] = 0 - years = [output_year, agent.year] - agent_market["prices"] = agent.filter_input(market["prices"], year=years) + agent_market["prices"] = agent.filter_input( + market["prices"], year=agent.year + ) techs = agent.filter_input( technologies, year=agent.year, ) - prices = agent_market["prices"].sel( - commodity=techs.commodity, year=agent.year - ) + prices = agent_market["prices"].sel(commodity=techs.commodity) demand = agent_market.consumption.sel(commodity=included) capacity = agent.filter_input(capacity_to_service_demand(demand, techs)) production = ( @@ -473,7 +479,7 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data data_agent["agent"] = agent.name data_agent["category"] = agent.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = agent.year data_agent = data_agent.fillna(0) data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "LCOE" @@ -490,13 +496,15 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data @register_output_quantity(name=["EAC"]) def metric_eac( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current emission costs across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_eac) + return _aggregate_sectors(sectors, market, year, op=sector_eac) -def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame: +def sector_eac( + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs +) -> pd.DataFrame: """Net Present Value of technologies over their lifetime.""" from muse.costs import equivalent_annual_cost as EAC from muse.quantities import capacity_to_service_demand, consumption @@ -510,8 +518,7 @@ def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataF agents = retro if len(retro) > 0 else new if len(technologies) > 0: for agent in agents: - output_year = agent.year - agent.forecast - agent_market = market.sel(year=output_year).copy() + agent_market = market.sel(year=agent.year).copy() agent_market["consumption"] = agent_market.consumption * agent.quantity included = [ i @@ -522,16 +529,15 @@ def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataF i for i in agent_market["commodity"].values if i not in included ] agent_market.loc[dict(commodity=excluded)] = 0 - years = [output_year, agent.year] - agent_market["prices"] = agent.filter_input(market["prices"], year=years) + agent_market["prices"] = agent.filter_input( + market["prices"], year=agent.year + ) techs = agent.filter_input( technologies, year=agent.year, ) - prices = agent_market["prices"].sel( - commodity=techs.commodity, year=agent.year - ) + prices = agent_market["prices"].sel(commodity=techs.commodity) demand = agent_market.consumption.sel(commodity=included) capacity = agent.filter_input(capacity_to_service_demand(demand, techs)) production = ( @@ -555,7 +561,7 @@ def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataF data_agent["agent"] = agent.name data_agent["category"] = agent.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = agent.year data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "capital_costs" ) diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py index 9ecb82fde..28e70fc0e 100644 --- a/src/muse/outputs/sector.py +++ b/src/muse/outputs/sector.py @@ -104,10 +104,10 @@ def _factory( def save_multiple_outputs(market, *args, year: int | None = None) -> list[Any]: if year is None: - year = int(market.year.min()) + year = int(market.year.max()) return [ - sink(quantity(market, *args), year=year) + sink(quantity(market, *args, year=year), year=year) for quantity, sink in zip(quantities, sinks) ] @@ -144,6 +144,7 @@ def capacity( market: xr.Dataset, capacity: xr.DataArray, rounding: int = 4, + **kwargs, ) -> pd.DataFrame: """Current capacity.""" result = capacity.to_dataframe().round(rounding) @@ -182,6 +183,7 @@ def consumption( sum_over: list[str] | None = None, drop: list[str] | None = None, rounding: int = 4, + **kwargs, ) -> xr.DataArray: """Current consumption.""" moutput = market.copy(deep=True).reset_index("timeslice") @@ -202,6 +204,7 @@ def supply( sum_over: list[str] | None = None, drop: list[str] | None = None, rounding: int = 4, + **kwargs, ) -> xr.DataArray: """Current supply.""" moutput = market.copy(deep=True).reset_index("timeslice") @@ -222,6 +225,7 @@ def costs( sum_over: list[str] | None = None, drop: list[str] | None = None, rounding: int = 4, + **kwargs, ) -> xr.DataArray: """Current costs.""" from muse.commodities import is_pollutant diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index c9b48c510..e7e4dee6d 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -281,9 +281,9 @@ def group_assets(x: xr.DataArray) -> xr.DataArray: # Convert result to global timeslicing scheme return self.convert_to_global_timeslicing(result) - def save_outputs(self) -> None: + def save_outputs(self, year: int) -> None: """Calls the outputs function with the current output data.""" - self.outputs(self.output_data, self.capacity) + self.outputs(self.output_data, self.capacity, year=year) def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: """Computes resulting market: production, consumption, and costs.""" diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 8c271eae7..9d6707290 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -47,3 +47,14 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 5b0ca6dc2..94a1a3b81 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv index 3dae1b300..1697de22d 100644 --- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv +++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,22.75000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 7336a95aa..6cfb41719 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index 2260d06b5..9e0d65a5d 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -2,39 +2,56 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020 +A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 -A1,19.00000000000,R1,2025,R1,residential,heatpump,retrofit,2025 +A1,13.00000000000,R1,2025,R1,residential,heatpump,retrofit,2025 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025 -A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2025 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2025 -A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2025 +A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 A1,19.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030 -A1,11.00000000000,R1,2030,R1,residential,heatpump,retrofit,2030 +A1,5.00000000000,R1,2030,R1,residential,heatpump,retrofit,2030 +A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2030 -A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2030 +A1,2.25000000000,R1,2030,R1,power,windturbine,retrofit,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,retrofit,2030 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2030 +A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 A1,11.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035 -A1,25.00000000000,R1,2035,R1,residential,heatpump,retrofit,2035 +A1,19.00000000000,R1,2035,R1,residential,heatpump,retrofit,2035 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2035 A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2035 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2035 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2035 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2035 +A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 A1,25.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040 -A1,17.00000000000,R1,2040,R1,residential,heatpump,retrofit,2040 +A1,11.00000000000,R1,2040,R1,residential,heatpump,retrofit,2040 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2040 A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 -A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2040 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2040 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2040 +A1,6.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 A1,17.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2045 +A1,25.00000000000,R1,2045,R1,residential,heatpump,retrofit,2045 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2045 A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 -A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2045 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2045 +A1,6.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 +A1,17.00000000000,R1,2050,R1,residential,heatpump,retrofit,2050 +A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2050 +A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 9c7507365..a42f1fbfa 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,26.24810000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,13.09670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,27.64030000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.65350000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,27.64030000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.65350000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,27.64030000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.65350000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,27.64030000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.65350000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,27.64030000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.65350000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,27.64030000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.65350000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv index 4cc29c1f0..fb43c23d0 100644 --- a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index cd458e05d..98e28b6bf 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index 38fcef76c..eb692f925 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -17,18 +17,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.11110000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,10.18560000000,gasCCGT,5,MUS$2010/kt,2025 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -101,3 +101,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index ca4c99ade..47c2dd664 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -56,3 +56,18 @@ A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 +A1,17.00000000000,R1,2050,R1,residential,gasstove,newcapa,2050 +A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,17.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,3.33330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index e35561fc7..e3ddfa9ba 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -179,3 +179,33 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,10.48670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,20.01420000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,10.60310000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.01420000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.60310000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.01420000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,10.60310000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.01420000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.60310000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,20.01420000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,10.60310000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,20.01420000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.60310000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCACapacity.csv b/tests/example_outputs/minimum_service/Results/MCACapacity.csv index 638edd772..28d815ddd 100644 --- a/tests/example_outputs/minimum_service/Results/MCACapacity.csv +++ b/tests/example_outputs/minimum_service/Results/MCACapacity.csv @@ -37,3 +37,7 @@ A1,8.70630000000,R1,2030,R1,industry,procammonia_1,newcapa,2045 A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2045 A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2045 A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2045 +A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2050 +A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2050 +A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2050 +A1,7.21970000000,R1,2050,R1,industry,procammonia_1,newcapa,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 65a63033f..0d4aa4dd2 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -95,3 +95,15 @@ fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 ammonia,all-week,all-day,spring-autumn,458.21660000000,R1,2,MUS$2010/Mt,2045 +fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 +fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 +fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 +ammonia,all-week,all-day,winter,455.91800000000,R1,0,MUS$2010/Mt,2050 +fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 +fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 +fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 +ammonia,all-week,all-day,summer,455.94940000000,R1,1,MUS$2010/Mt,2050 +fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 +fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 +fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 +ammonia,all-week,all-day,spring-autumn,455.91800000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCASupply.csv b/tests/example_outputs/minimum_service/Results/MCASupply.csv index fc0955d32..86ac2073f 100644 --- a/tests/example_outputs/minimum_service/Results/MCASupply.csv +++ b/tests/example_outputs/minimum_service/Results/MCASupply.csv @@ -47,3 +47,9 @@ ammonia,all-week,all-day,summer,R1,14.52450000000,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,R1,58000.48940000000,1,MUS$2010/kt,2045 ammonia,all-week,all-day,spring-autumn,R1,14.09730000000,2,MUS$2010/Mt,2045 CO2f,all-week,all-day,spring-autumn,R1,56294.59260000000,2,MUS$2010/kt,2045 +ammonia,all-week,all-day,winter,R1,13.74870000000,0,MUS$2010/Mt,2050 +CO2f,all-week,all-day,winter,R1,54623.16370000000,0,MUS$2010/kt,2050 +ammonia,all-week,all-day,summer,R1,14.10330000000,1,MUS$2010/Mt,2050 +CO2f,all-week,all-day,summer,R1,56035.99150000000,1,MUS$2010/kt,2050 +ammonia,all-week,all-day,spring-autumn,R1,13.74870000000,2,MUS$2010/Mt,2050 +CO2f,all-week,all-day,spring-autumn,R1,54623.16370000000,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index e5426235c..4609502be 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -58,3 +58,16 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 5b0ca6dc2..94a1a3b81 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCACapacity.csv b/tests/example_outputs/trade/Results/MCACapacity.csv index eba56c678..cb451056e 100644 --- a/tests/example_outputs/trade/Results/MCACapacity.csv +++ b/tests/example_outputs/trade/Results/MCACapacity.csv @@ -5,15 +5,26 @@ A1,240.00000000000,R1,2010,R1,power,gasCCGT,agent,2020 A1,200.00000000000,R2,2010,R2,power,gasCCGT,agent,2020 A1,3000.00000000000,R1,2010,R1,gas,gassupply1,agent,2020 A1,1200.00000000000,R2,2010,R2,gas,gassupply1,agent,2020 +A1,74.53330000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,563.34600000000,R1,2010,R1,residential,gasboiler,retrofit,2025 -A1,256.52070000000,R1,2025,R1,residential,heatpump,retrofit,2025 +A1,181.98730000000,R1,2025,R1,residential,heatpump,retrofit,2025 A1,192.00000000000,R1,2010,R1,power,gasCCGT,agent,2025 A1,140.00000000000,R2,2010,R2,power,gasCCGT,agent,2025 +A1,74.53330000000,R1,2030,R1,residential,heatpump,newcapa,2030 A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2030 A1,256.52070000000,R1,2025,R1,residential,heatpump,retrofit,2030 -A1,173.94730000000,R1,2030,R1,residential,heatpump,retrofit,2030 +A1,99.41400000000,R1,2030,R1,residential,heatpump,retrofit,2030 A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2030 A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030 A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030 A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030 A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030 +A1,18.63330000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035 +A1,173.94730000000,R1,2030,R1,residential,heatpump,retrofit,2035 +A1,326.11050000000,R1,2035,R1,residential,heatpump,retrofit,2035 +A1,0.38330000000,R2,2035,R2,residential,heatpump,newcapa,2035 +A1,20.82500000000,R2,2010,R2,residential,gasboiler,retrofit,2035 +A1,18.40000000000,R2,2035,R2,residential,heatpump,retrofit,2035 +A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035 +A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index e248bd000..b09131a22 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -89,3 +89,39 @@ gas,all-week,evening,all-year,20.52280000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,60.96730000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,18.24100000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,52.15770000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,41.37870000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,213.38810000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,26.31110000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,109.06920000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,22.07810000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,97.02350000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,41.37870000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,213.38810000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,26.31110000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,109.06920000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,22.07810000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,97.02350000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,41.37870000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,213.38810000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,26.31110000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,109.06920000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,22.07810000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,97.02350000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,41.37870000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,213.38810000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,26.31110000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,109.06920000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,22.07810000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,97.02350000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,41.37870000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,213.38810000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,26.31110000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,109.06920000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,22.07810000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,97.02350000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,41.37870000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,213.38810000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,26.31110000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,109.06920000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,22.07810000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,97.02350000000,R2,5,MUS$2010/PJ,2035 diff --git a/tests/test_outputs.py b/tests/test_outputs.py index e776f2d66..9a8105786 100644 --- a/tests/test_outputs.py +++ b/tests/test_outputs.py @@ -556,7 +556,7 @@ def test_consolidate_quantity(newcapa_agent, retro_agent): (*agents[retro_agent.uuid].keys(), "installed", "year", "technology", quantity) ) assert set(actual.columns) == cols - assert all(actual.year == newcapa_agent.forecast_year) + assert all(actual.year == newcapa_agent.year) assert all(actual.installed == newcapa_agent.year) assert all( name in (newcapa_agent.name, retro_agent.name) for name in actual.agent.unique()