Skip to content

Commit 8a19169

Browse files
tsmblandtsmbland
authored
Save outputs for investment year (#657)
* Fix outputs - save data for investment year * Revert change to fix tests * Update results files * Restore test * Revert change to outputs cache * Get outputs for first year * Update mca.py * Remove foresight parameter (#641) * Move broadcast_techs out of quantities module * Update _inner_split * Fix trade model * Fix constraints tests * Fix demand_share tests * Fix quantities tests * Fix trade tests * Fix adhoc model * Rename broadcast_techs to broadcast_over_assets * Better docstring, rename argument * Delete filter_with_template * Remove `broadcast_over_assets` from `capacity_in_use` * Fix trade tests * Edit TODO * Remove foresight parameter * Update settings and documentation * Temporarily suppress test * Fix carbon budget framework * Revert change to settings * Update settings and documentation * Revert change to settings * Update results * Small changes to fix tests * Add warning about deprecated parameter * Clarify log messages * Better final message * Update results * Actually update results * And more * Add kwargs arguments to prevent complaints * Add more kwargs arguments * Update trade result * Tidy run function
1 parent c6453d7 commit 8a19169

54 files changed

Lines changed: 1096 additions & 118 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/advanced-guide/extending-muse.ipynb‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
"def consumption_zero(\n",
101101
" market: Dataset,\n",
102102
" capacity: DataArray,\n",
103+
" **kwargs,\n",
103104
"):\n",
104105
" \"\"\"Current consumption.\"\"\"\n",
105106
" result = (\n",
@@ -300,13 +301,15 @@
300301
"def capacity(\n",
301302
" cached: list[xr.DataArray],\n",
302303
" agents: MutableMapping[str, MutableMapping[str, str]],\n",
304+
" **kwargs,\n",
303305
") -> pd.DataFrame:\n",
304306
" \"\"\"Consolidates the cached capacity into a single DataFrame to save.\n",
305307
"\n",
306308
" Args:\n",
307309
" cached (list[xr.DataArray]): The list of cached arrays during the calculation of\n",
308310
" the time period with the capacity.\n",
309311
" agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata.\n",
312+
" kwargs: unused.\n",
310313
"\n",
311314
" Returns:\n",
312315
" pd.DataFrame: DataFrame with the consolidated data for retro agents.\n",
@@ -457,6 +460,7 @@
457460
" sum_over: Optional[list[str]] = None,\n",
458461
" drop: Optional[list[str]] = None,\n",
459462
" rounding: int = 4,\n",
463+
" **kwargs,\n",
460464
"):\n",
461465
" \"\"\"Current consumption.\"\"\"\n",
462466
" result = (\n",
@@ -652,6 +656,11 @@
652656
"source": [
653657
"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."
654658
]
659+
},
660+
{
661+
"cell_type": "markdown",
662+
"metadata": {},
663+
"source": []
655664
}
656665
],
657666
"metadata": {

‎docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,30 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
9191
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
9292
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
9393
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
94+
A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
95+
A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
96+
A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
97+
A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050
98+
A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
99+
A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
100+
A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
101+
A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
102+
A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
103+
A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050
104+
A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
105+
A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
106+
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
107+
A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
108+
A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050
109+
A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
110+
A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
111+
A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
112+
A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
113+
A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
114+
A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050
115+
A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
116+
A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
117+
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
118+
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
119+
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
120+
A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050

‎docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
143143
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144144
heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
145145
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
146+
electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050
147+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
148+
heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050
149+
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
150+
electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050
151+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
152+
heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050
153+
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
154+
electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050
155+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
156+
heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050
157+
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
158+
electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050
159+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
160+
heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050
161+
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
162+
electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050
163+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
164+
heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050
165+
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
166+
electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050
167+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
168+
heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050
169+
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

‎docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,28 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
9191
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
9292
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
9393
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
94+
A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
95+
A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
96+
A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
97+
A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
98+
A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
99+
A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
100+
A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
101+
A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
102+
A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
103+
A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050
104+
A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
105+
A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
106+
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
107+
A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
108+
A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050
109+
A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
110+
A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
111+
A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
112+
A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
113+
A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
114+
A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
115+
A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
116+
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
117+
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
118+
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050

‎docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
143143
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144144
heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
145145
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
146+
electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050
147+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
148+
heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050
149+
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
150+
electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050
151+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
152+
heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050
153+
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
154+
electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050
155+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
156+
heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050
157+
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
158+
electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050
159+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
160+
heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050
161+
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
162+
electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050
163+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
164+
heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050
165+
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
166+
electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050
167+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
168+
heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050
169+
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

‎docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,13 @@ A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045
3838
A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045
3939
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045
4040
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
41+
A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050
42+
A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050
43+
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050
44+
A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050
45+
A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050
46+
A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050
47+
A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050
48+
A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050
49+
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050
50+
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050

‎docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045
143143
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144144
heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045
145145
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
146+
electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050
147+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
148+
heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050
149+
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
150+
electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050
151+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
152+
heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050
153+
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
154+
electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050
155+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
156+
heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050
157+
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
158+
electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050
159+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
160+
heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050
161+
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
162+
electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050
163+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
164+
heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050
165+
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
166+
electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050
167+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
168+
heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050
169+
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

‎docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,10 @@ A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045
3030
A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
3131
A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
3232
A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
33+
A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
34+
A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
35+
A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050
36+
A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
37+
A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
38+
A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
39+
A1,22.75000000000,R1,2050,R1,power,solarPV,newcapa,2050

‎docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045
143143
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144144
heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2045
145145
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
146+
electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050
147+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
148+
heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050
149+
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
150+
electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050
151+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
152+
heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050
153+
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
154+
electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050
155+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
156+
heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050
157+
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
158+
electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050
159+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
160+
heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050
161+
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
162+
electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050
163+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
164+
heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050
165+
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
166+
electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050
167+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
168+
heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050
169+
CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050

‎docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,13 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
4343
A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045
4444
A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045
4545
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
46+
A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
47+
A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
48+
A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
49+
A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050
50+
A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
51+
A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
52+
A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
53+
A1,7.91410000000,R1,2050,R1,power,solarPV,newcapa,2050
54+
A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
55+
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050

0 commit comments

Comments
 (0)