Skip to content

Commit ec75afb

Browse files
Updated results files for default_timeslice model for MinimumServiceFactor set to zero.
1 parent d6ae3a2 commit ec75afb

17 files changed

Lines changed: 398 additions & 469 deletions

File tree

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.57780000000
4-
0,2030,R1,gassupply1,2020,10.07780000000
5-
0,2035,R1,gassupply1,2020,2.57780000000
6-
0,2040,R1,gassupply1,2020,2.57780000000
7-
0,2045,R1,gassupply1,2020,2.57780000000
8-
0,2050,R1,gassupply1,2020,2.57780000000
9-
0,2059,R1,gassupply1,2020,2.57780000000
3+
0,2025,R1,gassupply1,2020,15.00000000000
4+
0,2030,R1,gassupply1,2020,7.50000000000
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.57780000000
4-
0,2030,R1,gassupply1,2020,10.07780000000
5-
0,2035,R1,gassupply1,2020,2.57780000000
6-
0,2040,R1,gassupply1,2020,2.57780000000
7-
0,2045,R1,gassupply1,2020,2.57780000000
8-
0,2050,R1,gassupply1,2020,2.57780000000
9-
0,2059,R1,gassupply1,2020,2.57780000000
3+
0,2025,R1,gassupply1,2020,15.00000000000
4+
0,2030,R1,gassupply1,2020,7.50000000000
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.57780000000
4-
0,2030,R1,gassupply1,2020,10.07780000000
5-
0,2035,R1,gassupply1,2020,2.57780000000
6-
0,2040,R1,gassupply1,2020,2.57780000000
7-
0,2045,R1,gassupply1,2020,2.57780000000
8-
0,2050,R1,gassupply1,2020,2.57780000000
9-
0,2059,R1,gassupply1,2020,2.57780000000
3+
0,2025,R1,gassupply1,2020,15.00000000000
4+
0,2030,R1,gassupply1,2020,7.50000000000
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.57780000000
4-
0,2030,R1,gassupply1,2020,10.07780000000
5-
0,2035,R1,gassupply1,2020,2.57780000000
6-
0,2040,R1,gassupply1,2020,2.57780000000
7-
0,2045,R1,gassupply1,2020,2.57780000000
8-
0,2050,R1,gassupply1,2020,2.57780000000
9-
0,2059,R1,gassupply1,2020,2.57780000000
3+
0,2025,R1,gassupply1,2020,15.00000000000
4+
0,2030,R1,gassupply1,2020,7.50000000000
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.57780000000
4-
0,2030,R1,gassupply1,2020,10.07780000000
5-
0,2035,R1,gassupply1,2020,2.57780000000
6-
0,2040,R1,gassupply1,2020,2.57780000000
7-
0,2045,R1,gassupply1,2020,2.57780000000
8-
0,2050,R1,gassupply1,2020,2.57780000000
9-
0,2059,R1,gassupply1,2020,2.57780000000
3+
0,2025,R1,gassupply1,2020,15.00000000000
4+
0,2030,R1,gassupply1,2020,7.50000000000
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.57780000000
4-
0,2030,R1,gassupply1,2020,10.07780000000
5-
0,2035,R1,gassupply1,2020,2.57780000000
6-
0,2040,R1,gassupply1,2020,2.57780000000
7-
0,2045,R1,gassupply1,2020,2.57780000000
8-
0,2050,R1,gassupply1,2020,2.57780000000
9-
0,2059,R1,gassupply1,2020,2.57780000000
3+
0,2025,R1,gassupply1,2020,15.00000000000
4+
0,2030,R1,gassupply1,2020,7.50000000000
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.57780000000
4-
0,2030,R1,gassupply1,2020,10.07780000000
5-
0,2035,R1,gassupply1,2020,2.57780000000
6-
0,2040,R1,gassupply1,2020,2.57780000000
7-
0,2045,R1,gassupply1,2020,2.57780000000
8-
0,2050,R1,gassupply1,2020,2.57780000000
9-
0,2059,R1,gassupply1,2020,2.57780000000
3+
0,2025,R1,gassupply1,2020,15.00000000000
4+
0,2030,R1,gassupply1,2020,7.50000000000

tests/example_outputs/default_timeslice/MCACapacity.csv

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,34 @@ A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
66
A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
77
A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
88
A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
9-
A1,17.57780000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
9+
A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
1010
A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
1111
A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
1212
A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
1313
A1,1.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
14-
A1,10.07780000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
14+
A1,7.50000000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
1515
A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
1616
A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
1717
A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
1818
A1,1.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
1919
A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
20-
A1,2.57780000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
2120
A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
2221
A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
2322
A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
2423
A1,1.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
2524
A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
2625
A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
27-
A1,2.57780000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
2826
A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
2927
A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
3028
A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
3129
A1,1.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
3230
A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
3331
A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
3432
A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
35-
A1,2.57780000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
3633
A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
3734
A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
3835
A1,1.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
3936
A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
4037
A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
4138
A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
4239
A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
43-
A1,2.57780000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050

tests/example_outputs/default_timeslice/MCAMetric_Supply.csv

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,resident
1111
A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
1212
A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
1313
A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
14-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,0,MUS$2010/PJ,2020
15-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,1,MUS$2010/PJ,2020
16-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,2,MUS$2010/PJ,2020
17-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,3,MUS$2010/PJ,2020
18-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,4,MUS$2010/PJ,2020
19-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,5,MUS$2010/PJ,2020
14+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
15+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
16+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
17+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
18+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020
19+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020
2020
A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
2121
A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
2222
A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
@@ -53,12 +53,12 @@ A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,p
5353
A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,gasCCGT,5,MUS$2010/PJ,2025
5454
A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,windturbine,5,MUS$2010/PJ,2025
5555
A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,38.70511111111,gasCCGT,5,MUS$2010/kt,2025
56-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,0,MUS$2010/PJ,2025
57-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,1,MUS$2010/PJ,2025
58-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,2,MUS$2010/PJ,2025
59-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,3,MUS$2010/PJ,2025
60-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,4,MUS$2010/PJ,2025
61-
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
56+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.32222222222,gassupply1,0,MUS$2010/PJ,2025
57+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.48333333333,gassupply1,1,MUS$2010/PJ,2025
58+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.32222222222,gassupply1,2,MUS$2010/PJ,2025
59+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.48333333333,gassupply1,3,MUS$2010/PJ,2025
60+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.41200000000,gassupply1,4,MUS$2010/PJ,2025
61+
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.64444444444,gassupply1,5,MUS$2010/PJ,2025
6262
A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
6363
A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
6464
A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030

0 commit comments

Comments
 (0)