Skip to content

Commit 091857f

Browse files
tsmblandtsmbland
committed
Merge branch 'remove_forecast' into interpolation
2 parents b8b24aa + 5a73814 commit 091857f

49 files changed

Lines changed: 997 additions & 715 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/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
agent,capacity,dst_region,installed,region,sector,technology,type,year
2-
A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
3-
A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
4-
A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
5-
A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
6-
A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
7-
A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
82
A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
93
A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025
104
A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
@@ -91,3 +85,30 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
9185
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
9286
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
9387
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
88+
A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
89+
A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
90+
A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
91+
A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050
92+
A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
93+
A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
94+
A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
95+
A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
96+
A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
97+
A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050
98+
A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
99+
A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
100+
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
101+
A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
102+
A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050
103+
A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
104+
A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
105+
A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
106+
A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
107+
A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
108+
A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050
109+
A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
110+
A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
111+
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
112+
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
113+
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
114+
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 & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,4 @@
11
commodity,day,hour,month,prices,region,timeslice,units_prices,year
2-
electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
3-
gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
4-
heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
5-
CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
6-
electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
7-
gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
8-
heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
9-
CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
10-
electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
11-
gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
12-
heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
13-
CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
14-
electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
15-
gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
16-
heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
17-
CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
18-
electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
19-
gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
20-
heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
21-
CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
22-
electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
23-
gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
24-
heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
25-
CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
262
electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025
273
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
284
heat,all-week,night,all-year,11.24720000000,R1,0,MUS$2010/PJ,2025
@@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
143119
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144120
heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
145121
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
122+
electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050
123+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
124+
heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050
125+
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
126+
electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050
127+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
128+
heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050
129+
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
130+
electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050
131+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
132+
heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050
133+
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
134+
electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050
135+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
136+
heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050
137+
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
138+
electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050
139+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
140+
heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050
141+
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
142+
electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050
143+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
144+
heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050
145+
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
agent,capacity,dst_region,installed,region,sector,technology,type,year
2-
A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
3-
A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
4-
A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
5-
A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
6-
A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
7-
A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
82
A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
93
A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025
104
A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
@@ -91,3 +85,28 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
9185
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
9286
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
9387
A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
88+
A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
89+
A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
90+
A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
91+
A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
92+
A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
93+
A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
94+
A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
95+
A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
96+
A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
97+
A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050
98+
A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
99+
A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
100+
A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
101+
A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
102+
A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050
103+
A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
104+
A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
105+
A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
106+
A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
107+
A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
108+
A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
109+
A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
110+
A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
111+
A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
112+
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 & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,4 @@
11
commodity,day,hour,month,prices,region,timeslice,units_prices,year
2-
electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
3-
gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
4-
heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
5-
CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
6-
electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
7-
gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
8-
heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
9-
CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
10-
electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
11-
gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
12-
heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
13-
CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
14-
electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
15-
gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
16-
heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
17-
CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
18-
electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
19-
gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
20-
heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
21-
CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
22-
electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
23-
gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
24-
heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
25-
CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
262
electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025
273
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
284
heat,all-week,night,all-year,11.24720000000,R1,0,MUS$2010/PJ,2025
@@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
143119
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144120
heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
145121
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
122+
electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050
123+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
124+
heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050
125+
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
126+
electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050
127+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
128+
heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050
129+
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
130+
electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050
131+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
132+
heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050
133+
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
134+
electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050
135+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
136+
heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050
137+
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
138+
electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050
139+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
140+
heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050
141+
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
142+
electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050
143+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
144+
heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050
145+
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
agent,capacity,dst_region,installed,region,sector,technology,type,year
2-
A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
3-
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
4-
A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
52
A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
63
A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2025
74
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
@@ -38,3 +35,13 @@ A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045
3835
A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045
3936
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045
4037
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
38+
A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050
39+
A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050
40+
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050
41+
A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050
42+
A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050
43+
A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050
44+
A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050
45+
A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050
46+
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050
47+
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 & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,4 @@
11
commodity,day,hour,month,prices,region,timeslice,units_prices,year
2-
electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020
3-
gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020
4-
heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020
5-
CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020
6-
electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020
7-
gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020
8-
heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020
9-
CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020
10-
electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020
11-
gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020
12-
heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020
13-
CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020
14-
electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020
15-
gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020
16-
heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020
17-
CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020
18-
electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020
19-
gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020
20-
heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020
21-
CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020
22-
electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
23-
gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
24-
heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
25-
CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
262
electricity,all-week,night,all-year,20.19960000000,R1,0,MUS$2010/PJ,2025
273
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
284
heat,all-week,night,all-year,11.02330000000,R1,0,MUS$2010/PJ,2025
@@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045
143119
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
144120
heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045
145121
CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
122+
electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050
123+
gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
124+
heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050
125+
CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
126+
electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050
127+
gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
128+
heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050
129+
CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
130+
electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050
131+
gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
132+
heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050
133+
CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
134+
electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050
135+
gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
136+
heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050
137+
CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
138+
electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050
139+
gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
140+
heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050
141+
CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
142+
electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050
143+
gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
144+
heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050
145+
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
agent,capacity,dst_region,installed,region,sector,technology,type,year
2-
A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
3-
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
4-
A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
52
A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
63
A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
74
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
@@ -30,3 +27,10 @@ A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045
3027
A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
3128
A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
3229
A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
30+
A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
31+
A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
32+
A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050
33+
A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
34+
A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
35+
A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
36+
A1,22.75000000000,R1,2050,R1,power,solarPV,newcapa,2050

0 commit comments

Comments
 (0)