Skip to content

Commit 237bae1

Browse files
tsmblandtsmbland
authored
Merge pull request #524 from EnergySystemsModellingLab/objsort
Remove ObjSort column from technodata timeslices files
2 parents 03f38f8 + 99e08a0 commit 237bae1

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/technodata/power/TechnodataTimeslices.csv‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
2-
Unit,-,Year,-,-,-,-,-,-
3-
gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2
4-
gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4
5-
gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6
6-
gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4
7-
gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8
8-
gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
9-
windturbine,R1,2020,upper,all-year,all-week,night,1,0
10-
windturbine,R1,2020,upper,all-year,all-week,morning,1,0
11-
windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0
12-
windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0
13-
windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0
14-
windturbine,R1,2020,upper,all-year,all-week,evening,1,0
1+
ProcessName,RegionName,Time,month,day,hour,UtilizationFactor,MinimumServiceFactor
2+
Unit,-,Year,-,-,-,-,-
3+
gasCCGT,R1,2020,all-year,all-week,night,1,0.2
4+
gasCCGT,R1,2020,all-year,all-week,morning,1,0.4
5+
gasCCGT,R1,2020,all-year,all-week,afternoon,1,0.6
6+
gasCCGT,R1,2020,all-year,all-week,early-peak,1,0.4
7+
gasCCGT,R1,2020,all-year,all-week,late-peak,1,0.8
8+
gasCCGT,R1,2020,all-year,all-week,evening,1,1
9+
windturbine,R1,2020,all-year,all-week,night,1,0
10+
windturbine,R1,2020,all-year,all-week,morning,1,0
11+
windturbine,R1,2020,all-year,all-week,afternoon,1,0
12+
windturbine,R1,2020,all-year,all-week,early-peak,1,0
13+
windturbine,R1,2020,all-year,all-week,late-peak,1,0
14+
windturbine,R1,2020,all-year,all-week,evening,1,0

‎docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/technodata/power/TechnodataTimeslices.csv‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
2-
Unit,-,Year,-,-,-,-,-,-
3-
gasCCGT,R1,2020,upper,all-year,all-week,night,1,0.2
4-
gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0.4
5-
gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0.6
6-
gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0.4
7-
gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0.8
8-
gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
9-
windturbine,R1,2020,upper,all-year,all-week,night,1,0
10-
windturbine,R1,2020,upper,all-year,all-week,morning,0.5,0
11-
windturbine,R1,2020,upper,all-year,all-week,afternoon,0.5,0
12-
windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0
13-
windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0
14-
windturbine,R1,2020,upper,all-year,all-week,evening,1,0
1+
ProcessName,RegionName,Time,month,day,hour,UtilizationFactor,MinimumServiceFactor
2+
Unit,-,Year,-,-,-,-,-
3+
gasCCGT,R1,2020,all-year,all-week,night,1,0.2
4+
gasCCGT,R1,2020,all-year,all-week,morning,1,0.4
5+
gasCCGT,R1,2020,all-year,all-week,afternoon,1,0.6
6+
gasCCGT,R1,2020,all-year,all-week,early-peak,1,0.4
7+
gasCCGT,R1,2020,all-year,all-week,late-peak,1,0.8
8+
gasCCGT,R1,2020,all-year,all-week,evening,1,1
9+
windturbine,R1,2020,all-year,all-week,night,1,0
10+
windturbine,R1,2020,all-year,all-week,morning,0.5,0
11+
windturbine,R1,2020,all-year,all-week,afternoon,0.5,0
12+
windturbine,R1,2020,all-year,all-week,early-peak,1,0
13+
windturbine,R1,2020,all-year,all-week,late-peak,1,0
14+
windturbine,R1,2020,all-year,all-week,evening,1,0

‎src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
2-
Unit,-,Year,-,-,-,-,-,-
3-
gasCCGT,R1,2020,upper,all-year,all-week,night,1,0
4-
gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0
5-
gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0
6-
gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0
7-
gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0
8-
gasCCGT,R1,2020,upper,all-year,all-week,evening,1,0
9-
windturbine,R1,2020,upper,all-year,all-week,night,1,0
10-
windturbine,R1,2020,upper,all-year,all-week,morning,1,0
11-
windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0
12-
windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0
13-
windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0
14-
windturbine,R1,2020,upper,all-year,all-week,evening,1,0
1+
ProcessName,RegionName,Time,month,day,hour,UtilizationFactor,MinimumServiceFactor
2+
Unit,-,Year,-,-,-,-,-
3+
gasCCGT,R1,2020,all-year,all-week,night,1,0
4+
gasCCGT,R1,2020,all-year,all-week,morning,1,0
5+
gasCCGT,R1,2020,all-year,all-week,afternoon,1,0
6+
gasCCGT,R1,2020,all-year,all-week,early-peak,1,0
7+
gasCCGT,R1,2020,all-year,all-week,late-peak,1,0
8+
gasCCGT,R1,2020,all-year,all-week,evening,1,0
9+
windturbine,R1,2020,all-year,all-week,night,1,0
10+
windturbine,R1,2020,all-year,all-week,morning,1,0
11+
windturbine,R1,2020,all-year,all-week,afternoon,1,0
12+
windturbine,R1,2020,all-year,all-week,early-peak,1,0
13+
windturbine,R1,2020,all-year,all-week,late-peak,1,0
14+
windturbine,R1,2020,all-year,all-week,evening,1,0

0 commit comments

Comments
 (0)