Skip to content

Commit 2e8e1b5

Browse files
HarmonicRefluxHarmonicReflux
authored
Merge pull request #403 from EnergySystemsModellingLab/334_change_MinimumServiceFactor_for_default_timeslices_model
334 change minimum service factor for default timeslices model
2 parents d91476d + ec75afb commit 2e8e1b5

22 files changed

Lines changed: 427 additions & 540 deletions

File tree

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

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎docs/user-guide/min-max-timeslice-constraints.ipynb‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,28 @@
3030
"python -m muse --model default_timeslice --copy PATH/TO/COPY/THE/MODEL/TO\n",
3131
"```\n",
3232
"\n",
33-
"You will see that, compared to the `default` example, this model has an additional `TechnodataTimeslices.csv` file in the `power` and `residential` sectors, which has the columns `ProcessName`, `RegionName`, `Time`, `month`, `day`, `hour`, `UtilizationFactor`, `MinimumServiceFactor`.\n",
34-
"The majority of these columns are self explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n",
33+
"You will see that, compared to the `default` example, this model has an additional `TechnodataTimeslices.csv` file in the `power` sector, which has the columns `ProcessName`, `RegionName`, `Time`, `month`, `day`, `hour`, `UtilizationFactor`, `MinimumServiceFactor`.\n",
34+
"The majority of these columns are self-explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n",
3535
"The `UtilizationFactor` column specifies the maximum utilization factor for the respective technologies in the respective timeslices, and the `MinimumServiceFactor` specifies the minimum service factor of a technology.\n",
3636
"The timeslice based columns, however, are dynamic and will match the levels as defined in the `toml` file. \n",
3737
"\n",
3838
"We will modify the minimum service factor for `gasCCGT` in the `power` sector as follows.\n",
3939
"\n",
40-
"|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n",
41-
"|-|-|-|-|-|-|-|-|\n",
42-
"|Unit|-|Year|-|-|-|-|-|\n",
43-
"|gasCCGT|R1|2020|all-year|all-week|night|1|**0.2**|\n",
44-
"|gasCCGT|R1|2020|all-year|all-week|morning|1|**0.4**|\n",
45-
"|gasCCGT|R1|2020|all-year|all-week|afternoon|1|**0.6**|\n",
46-
"|gasCCGT|R1|2020|all-year|all-week|early-peak|1|**0.4**|\n",
47-
"|gasCCGT|R1|2020|all-year|all-week|late-peak|1|**0.8**|\n",
48-
"|gasCCGT|R1|2020|all-year|all-week|evening|1|**1**|\n",
49-
"|windturbine|R1|2020|all-year|all-week|night|1|1|\n",
50-
"|windturbine|R1|2020|all-year|all-week|morning|1|1|\n",
51-
"|windturbine|R1|2020|all-year|all-week|afternoon|1|1|\n",
52-
"|windturbine|R1|2020|all-year|all-week|early-peak|1|1|\n",
53-
"|windturbine|R1|2020|all-year|all-week|late-peak|1|1|\n",
54-
"|windturbine|R1|2020|all-year|all-week|evening|1|1|\n"
40+
"| ProcessName | RegionName | Time | month | day | hour | UtilizationFactor | MinimumServiceFactor |\n",
41+
"|-------------|------------|------|----------|----------|------------|-------------------|----------------------|\n",
42+
"| Unit | - | Year | - | - | - | - | - |\n",
43+
"| gasCCGT | R1 | 2020 | all-year | all-week | night | 1 | **0.2** |\n",
44+
"| gasCCGT | R1 | 2020 | all-year | all-week | morning | 1 | **0.4** |\n",
45+
"| gasCCGT | R1 | 2020 | all-year | all-week | afternoon | 1 | **0.6** |\n",
46+
"| gasCCGT | R1 | 2020 | all-year | all-week | early-peak | 1 | **0.4** |\n",
47+
"| gasCCGT | R1 | 2020 | all-year | all-week | late-peak | 1 | **0.8** |\n",
48+
"| gasCCGT | R1 | 2020 | all-year | all-week | evening | 1 | **1** |\n",
49+
"| windturbine | R1 | 2020 | all-year | all-week | night | 1 | 0 |\n",
50+
"| windturbine | R1 | 2020 | all-year | all-week | morning | 1 | 0 |\n",
51+
"| windturbine | R1 | 2020 | all-year | all-week | afternoon | 1 | 0 |\n",
52+
"| windturbine | R1 | 2020 | all-year | all-week | early-peak | 1 | 0 |\n",
53+
"| windturbine | R1 | 2020 | all-year | all-week | late-peak | 1 | 0 |\n",
54+
"| windturbine | R1 | 2020 | all-year | all-week | evening | 1 | 0 |\n"
5555
]
5656
},
5757
{

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

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

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

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv‎

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/Gas/Capacity/2025.csv‎

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/Gas/Capacity/2030.csv‎

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/Gas/Capacity/2035.csv‎

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/Gas/Capacity/2040.csv‎

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

0 commit comments

Comments
 (0)