Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

34 changes: 17 additions & 17 deletions docs/user-guide/min-max-timeslice-constraints.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@
"python -m muse --model default_timeslice --copy PATH/TO/COPY/THE/MODEL/TO\n",
"```\n",
"\n",
"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",
"The majority of these columns are self explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n",
"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",
"The majority of these columns are self-explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n",
"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",
"The timeslice based columns, however, are dynamic and will match the levels as defined in the `toml` file. \n",
"\n",
"We will modify the minimum service factor for `gasCCGT` in the `power` sector as follows.\n",
"\n",
"|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n",
"|-|-|-|-|-|-|-|-|\n",
"|Unit|-|Year|-|-|-|-|-|\n",
"|gasCCGT|R1|2020|all-year|all-week|night|1|**0.2**|\n",
"|gasCCGT|R1|2020|all-year|all-week|morning|1|**0.4**|\n",
"|gasCCGT|R1|2020|all-year|all-week|afternoon|1|**0.6**|\n",
"|gasCCGT|R1|2020|all-year|all-week|early-peak|1|**0.4**|\n",
"|gasCCGT|R1|2020|all-year|all-week|late-peak|1|**0.8**|\n",
"|gasCCGT|R1|2020|all-year|all-week|evening|1|**1**|\n",
"|windturbine|R1|2020|all-year|all-week|night|1|1|\n",
"|windturbine|R1|2020|all-year|all-week|morning|1|1|\n",
"|windturbine|R1|2020|all-year|all-week|afternoon|1|1|\n",
"|windturbine|R1|2020|all-year|all-week|early-peak|1|1|\n",
"|windturbine|R1|2020|all-year|all-week|late-peak|1|1|\n",
"|windturbine|R1|2020|all-year|all-week|evening|1|1|\n"
"| ProcessName | RegionName | Time | month | day | hour | UtilizationFactor | MinimumServiceFactor |\n",
"|-------------|------------|------|----------|----------|------------|-------------------|----------------------|\n",
"| Unit | - | Year | - | - | - | - | - |\n",
"| gasCCGT | R1 | 2020 | all-year | all-week | night | 1 | **0.2** |\n",
"| gasCCGT | R1 | 2020 | all-year | all-week | morning | 1 | **0.4** |\n",
"| gasCCGT | R1 | 2020 | all-year | all-week | afternoon | 1 | **0.6** |\n",
"| gasCCGT | R1 | 2020 | all-year | all-week | early-peak | 1 | **0.4** |\n",
"| gasCCGT | R1 | 2020 | all-year | all-week | late-peak | 1 | **0.8** |\n",
"| gasCCGT | R1 | 2020 | all-year | all-week | evening | 1 | **1** |\n",
"| windturbine | R1 | 2020 | all-year | all-week | night | 1 | 0 |\n",
"| windturbine | R1 | 2020 | all-year | all-week | morning | 1 | 0 |\n",
"| windturbine | R1 | 2020 | all-year | all-week | afternoon | 1 | 0 |\n",
"| windturbine | R1 | 2020 | all-year | all-week | early-peak | 1 | 0 |\n",
"| windturbine | R1 | 2020 | all-year | all-week | late-peak | 1 | 0 |\n",
"| windturbine | R1 | 2020 | all-year | all-week | evening | 1 | 0 |\n"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks a lot uglier on github than it did in pycharm, but it's probably still fine

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it depends on the screen width

]
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor
Unit,-,Year,-,-,-,-,-,-
gasCCGT,R1,2020,upper,all-year,all-week,night,1,1
gasCCGT,R1,2020,upper,all-year,all-week,morning,1,1
gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,1
gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,1
gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,1
gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1
windturbine,R1,2020,upper,all-year,all-week,night,1,1
windturbine,R1,2020,upper,all-year,all-week,morning,1,1
windturbine,R1,2020,upper,all-year,all-week,afternoon,1,1
windturbine,R1,2020,upper,all-year,all-week,early-peak,1,1
windturbine,R1,2020,upper,all-year,all-week,late-peak,1,1
windturbine,R1,2020,upper,all-year,all-week,evening,1,1
gasCCGT,R1,2020,upper,all-year,all-week,night,1,0
gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0
gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0
gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0
gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0
gasCCGT,R1,2020,upper,all-year,all-week,evening,1,0
windturbine,R1,2020,upper,all-year,all-week,night,1,0
windturbine,R1,2020,upper,all-year,all-week,morning,1,0
windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0
windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0
windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0
windturbine,R1,2020,upper,all-year,all-week,evening,1,0

This file was deleted.

9 changes: 2 additions & 7 deletions tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.57780000000
0,2030,R1,gassupply1,2020,10.07780000000
0,2035,R1,gassupply1,2020,2.57780000000
0,2040,R1,gassupply1,2020,2.57780000000
0,2045,R1,gassupply1,2020,2.57780000000
0,2050,R1,gassupply1,2020,2.57780000000
0,2059,R1,gassupply1,2020,2.57780000000
0,2025,R1,gassupply1,2020,15.00000000000
0,2030,R1,gassupply1,2020,7.50000000000
9 changes: 2 additions & 7 deletions tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.57780000000
0,2030,R1,gassupply1,2020,10.07780000000
0,2035,R1,gassupply1,2020,2.57780000000
0,2040,R1,gassupply1,2020,2.57780000000
0,2045,R1,gassupply1,2020,2.57780000000
0,2050,R1,gassupply1,2020,2.57780000000
0,2059,R1,gassupply1,2020,2.57780000000
0,2025,R1,gassupply1,2020,15.00000000000
0,2030,R1,gassupply1,2020,7.50000000000
9 changes: 2 additions & 7 deletions tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.57780000000
0,2030,R1,gassupply1,2020,10.07780000000
0,2035,R1,gassupply1,2020,2.57780000000
0,2040,R1,gassupply1,2020,2.57780000000
0,2045,R1,gassupply1,2020,2.57780000000
0,2050,R1,gassupply1,2020,2.57780000000
0,2059,R1,gassupply1,2020,2.57780000000
0,2025,R1,gassupply1,2020,15.00000000000
0,2030,R1,gassupply1,2020,7.50000000000
9 changes: 2 additions & 7 deletions tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.57780000000
0,2030,R1,gassupply1,2020,10.07780000000
0,2035,R1,gassupply1,2020,2.57780000000
0,2040,R1,gassupply1,2020,2.57780000000
0,2045,R1,gassupply1,2020,2.57780000000
0,2050,R1,gassupply1,2020,2.57780000000
0,2059,R1,gassupply1,2020,2.57780000000
0,2025,R1,gassupply1,2020,15.00000000000
0,2030,R1,gassupply1,2020,7.50000000000
9 changes: 2 additions & 7 deletions tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.57780000000
0,2030,R1,gassupply1,2020,10.07780000000
0,2035,R1,gassupply1,2020,2.57780000000
0,2040,R1,gassupply1,2020,2.57780000000
0,2045,R1,gassupply1,2020,2.57780000000
0,2050,R1,gassupply1,2020,2.57780000000
0,2059,R1,gassupply1,2020,2.57780000000
0,2025,R1,gassupply1,2020,15.00000000000
0,2030,R1,gassupply1,2020,7.50000000000
9 changes: 2 additions & 7 deletions tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.57780000000
0,2030,R1,gassupply1,2020,10.07780000000
0,2035,R1,gassupply1,2020,2.57780000000
0,2040,R1,gassupply1,2020,2.57780000000
0,2045,R1,gassupply1,2020,2.57780000000
0,2050,R1,gassupply1,2020,2.57780000000
0,2059,R1,gassupply1,2020,2.57780000000
0,2025,R1,gassupply1,2020,15.00000000000
0,2030,R1,gassupply1,2020,7.50000000000
9 changes: 2 additions & 7 deletions tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
asset,year,region,technology,installed,capacity
0,2020,R1,gassupply1,2020,15.00000000000
0,2025,R1,gassupply1,2020,17.57780000000
0,2030,R1,gassupply1,2020,10.07780000000
0,2035,R1,gassupply1,2020,2.57780000000
0,2040,R1,gassupply1,2020,2.57780000000
0,2045,R1,gassupply1,2020,2.57780000000
0,2050,R1,gassupply1,2020,2.57780000000
0,2059,R1,gassupply1,2020,2.57780000000
0,2025,R1,gassupply1,2020,15.00000000000
0,2030,R1,gassupply1,2020,7.50000000000
8 changes: 2 additions & 6 deletions tests/example_outputs/default_timeslice/MCACapacity.csv
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,34 @@ A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025
A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025
A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025
A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025
A1,17.57780000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025
A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030
A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030
A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030
A1,1.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030
A1,10.07780000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
A1,7.50000000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030
A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035
A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035
A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035
A1,1.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035
A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035
A1,2.57780000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035
A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040
A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040
A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040
A1,1.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040
A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040
A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040
A1,2.57780000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040
A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045
A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045
A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045
A1,1.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045
A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045
A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045
A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045
A1,2.57780000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045
A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050
A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050
A1,1.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050
A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050
A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050
A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050
A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050
A1,2.57780000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050
24 changes: 12 additions & 12 deletions tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,resident
A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020
A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,0,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,1,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,2,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,3,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,4,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,5,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020
A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
Expand Down Expand Up @@ -53,12 +53,12 @@ A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,p
A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,gasCCGT,5,MUS$2010/PJ,2025
A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,windturbine,5,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,38.70511111111,gasCCGT,5,MUS$2010/kt,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,0,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,1,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,2,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,3,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,4,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.32222222222,gassupply1,0,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.48333333333,gassupply1,1,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.32222222222,gassupply1,2,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.48333333333,gassupply1,3,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.41200000000,gassupply1,4,MUS$2010/PJ,2025
A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.64444444444,gassupply1,5,MUS$2010/PJ,2025
A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
Expand Down
Loading