Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4fd0b40
Pseudocode for generating tutorial models
tsmbland Apr 23, 2024
866b40e
Improvements to pseudocode
tsmbland Apr 24, 2024
841f0f7
Merge branch 'develop' into generate_tutorial_models
tsmbland Apr 24, 2024
8f9b80c
Merge branch 'develop' into generate_tutorial_models
tsmbland May 10, 2024
972cdde
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 10, 2024
5dee0f4
Code to generate models for tutorial 1
tsmbland May 10, 2024
15f0865
Fixing remaining model inconsistencies
tsmbland May 10, 2024
a91c465
Merge branch 'develop' into generate_tutorial_models
tsmbland May 13, 2024
3ee0221
Tutorial 2
tsmbland May 14, 2024
96ef4f2
Tutorial 3
tsmbland May 14, 2024
22677f5
Use tomlkit for settings files
tsmbland May 14, 2024
4b16b9f
Tutorial 4 (4.2 still faulty)
tsmbland May 14, 2024
7b8ab12
Remove results files
tsmbland May 15, 2024
3d0a03b
Tutorial 5
tsmbland May 15, 2024
d16193c
Merge branch 'develop' into generate_tutorial_models
tsmbland May 15, 2024
7615a34
Merge branch 'generate_tutorial_models' of https://github.com/EnergyS…
tsmbland May 15, 2024
3bbcd02
Delete more results, restructure
tsmbland May 15, 2024
0a7fa9a
Tutorial 6
tsmbland May 15, 2024
c70ff86
Tutorial 7
tsmbland May 15, 2024
7b75caf
Use pathlib
tsmbland May 15, 2024
e044d0c
More pathlib, regenerating models
tsmbland May 15, 2024
7374f9c
Small improvements to wizard module
tsmbland May 15, 2024
0f93c16
Delete more results
tsmbland May 15, 2024
159a0a6
Script for running models in parallel
tsmbland May 15, 2024
247fafb
Restore accidentally deleted file
tsmbland May 15, 2024
539aa84
Fix path
tsmbland May 15, 2024
5fdb83c
Merge branch 'develop' into generate_tutorial_models
tsmbland May 16, 2024
44206bd
Add back results files
tsmbland May 16, 2024
d3d30cf
Nicer comments, removing some unnecessary changes
tsmbland May 16, 2024
3b47054
Fix tutorial 4.2
tsmbland May 16, 2024
bcef20e
Add tomlkit to dependencies
tsmbland May 16, 2024
5d90b1a
Fix faulty paths
tsmbland May 16, 2024
87781f4
Remove index from consumption files
tsmbland May 16, 2024
09b23d7
Limit MinimumServiceFactor to <1
tsmbland May 16, 2024
935940a
Sorting paths for generating models
tsmbland May 21, 2024
24fede3
Docstrings
tsmbland May 21, 2024
579651f
technodata > Technodata
tsmbland May 21, 2024
f23806d
Add tests for wizard module
tsmbland May 21, 2024
543522d
Merge branch 'develop' into generate_tutorial_models
tsmbland May 21, 2024
68e0a98
Fix test_get_sectors function
tsmbland May 21, 2024
fbd9053
Use generator expressions
tsmbland May 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion docs/advanced-guide/extending-muse.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.2"
"version": "3.9.18"
},
"vscode": {
"interpreter": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
asset,year,region,installed,technology,capacity
0,2020,R1,2020,gassupply1,15.00000000000
0,2025,R1,2020,gassupply1,15.00000000000
0,2030,R1,2020,gassupply1,7.50000000000
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
asset,year,region,technology,installed,capacity
0,2025,R1,gassupply1,2020,15.00000000000
0,2030,R1,gassupply1,2020,7.50000000000
1,2030,R1,gassupply1,2025,2.79440000000
1,2035,R1,gassupply1,2025,2.79440000000
1,2040,R1,gassupply1,2025,2.79440000000
1,2045,R1,gassupply1,2025,2.79440000000
1,2050,R1,gassupply1,2025,2.79440000000
1,2064,R1,gassupply1,2025,2.79440000000
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
asset,year,region,installed,technology,capacity
0,2030,R1,2020,gassupply1,7.50000000000
1,2030,R1,2025,gassupply1,2.79440000000
1,2035,R1,2025,gassupply1,2.79440000000
1,2040,R1,2025,gassupply1,2.79440000000
1,2045,R1,2025,gassupply1,2.79440000000
1,2050,R1,2025,gassupply1,2.79440000000
1,2064,R1,2025,gassupply1,2.79440000000
2,2035,R1,2030,gassupply1,7.50000000000
2,2040,R1,2030,gassupply1,7.50000000000
2,2045,R1,2030,gassupply1,7.50000000000
2,2050,R1,2030,gassupply1,7.50000000000
2,2064,R1,2030,gassupply1,7.50000000000
2,2065,R1,2030,gassupply1,7.50000000000
2,2069,R1,2030,gassupply1,7.50000000000
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
asset,year,region,installed,technology,capacity
1,2035,R1,2025,gassupply1,2.79440000000
1,2040,R1,2025,gassupply1,2.79440000000
1,2045,R1,2025,gassupply1,2.79440000000
1,2050,R1,2025,gassupply1,2.79440000000
1,2064,R1,2025,gassupply1,2.79440000000
2,2035,R1,2030,gassupply1,7.50000000000
2,2040,R1,2030,gassupply1,7.50000000000
2,2045,R1,2030,gassupply1,7.50000000000
2,2050,R1,2030,gassupply1,7.50000000000
2,2064,R1,2030,gassupply1,7.50000000000
2,2065,R1,2030,gassupply1,7.50000000000
2,2069,R1,2030,gassupply1,7.50000000000
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
asset,year,region,installed,technology,capacity
1,2040,R1,2025,gassupply1,2.79440000000
1,2045,R1,2025,gassupply1,2.79440000000
1,2050,R1,2025,gassupply1,2.79440000000
1,2064,R1,2025,gassupply1,2.79440000000
2,2040,R1,2030,gassupply1,7.50000000000
2,2045,R1,2030,gassupply1,7.50000000000
2,2050,R1,2030,gassupply1,7.50000000000
2,2064,R1,2030,gassupply1,7.50000000000
2,2065,R1,2030,gassupply1,7.50000000000
2,2069,R1,2030,gassupply1,7.50000000000
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
asset,year,region,installed,technology,capacity
1,2045,R1,2025,gassupply1,2.79440000000
1,2050,R1,2025,gassupply1,2.79440000000
1,2064,R1,2025,gassupply1,2.79440000000
2,2045,R1,2030,gassupply1,7.50000000000
2,2050,R1,2030,gassupply1,7.50000000000
2,2064,R1,2030,gassupply1,7.50000000000
2,2065,R1,2030,gassupply1,7.50000000000
2,2069,R1,2030,gassupply1,7.50000000000
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
asset,year,region,installed,technology,capacity
1,2050,R1,2025,gassupply1,2.79440000000
1,2055,R1,2025,gassupply1,2.79440000000
1,2064,R1,2025,gassupply1,2.79440000000
2,2050,R1,2030,gassupply1,7.50000000000
2,2055,R1,2030,gassupply1,7.50000000000
2,2064,R1,2030,gassupply1,7.50000000000
2,2065,R1,2030,gassupply1,7.50000000000
2,2069,R1,2030,gassupply1,7.50000000000
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
,agent,capacity,dst_region,index,installed,region,sector,technology,type,year
2,A1,10.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2020
0,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2020
0,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
2,A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
7,A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
2,A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
12,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2025
25,A1,6.75000000000,R1,44,2020,R1,power,windturbine,retrofit,2025
2,A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
6,A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
7,A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2030
11,A1,10.00000000000,R1,12,2020,R1,power,solarPV,retrofit,2030
12,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2030
31,A1,6.75000000000,R1,48,2020,R1,power,windturbine,retrofit,2030
0,A1,7.50000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
1,A1,2.79440000000,R1,1,2025,R1,gas,gassupply1,retrofit,2030
2,A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
8,A1,6.90000000000,R1,14,2025,R1,residential,heatpump,retrofit,2035
9,A1,25.00000000000,R1,15,2030,R1,residential,heatpump,retrofit,2035
0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2035
21,A1,10.00000000000,R1,26,2020,R1,power,solarPV,retrofit,2035
22,A1,2.40000000000,R1,27,2025,R1,power,solarPV,retrofit,2035
23,A1,6.00000000000,R1,28,2030,R1,power,solarPV,retrofit,2035
48,A1,6.75000000000,R1,78,2020,R1,power,windturbine,retrofit,2035
0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2035
1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
2,A1,0.91000000000,R1,0,2035,R1,residential,gasboiler,retrofit,2040
6,A1,25.00000000000,R1,7,2030,R1,residential,heatpump,retrofit,2040
7,A1,16.09000000000,R1,8,2035,R1,residential,heatpump,retrofit,2040
0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2040
1,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2040
20,A1,10.00000000000,R1,24,2020,R1,power,solarPV,retrofit,2040
21,A1,2.40000000000,R1,25,2025,R1,power,solarPV,retrofit,2040
22,A1,6.00000000000,R1,26,2030,R1,power,solarPV,retrofit,2040
23,A1,10.00000000000,R1,27,2035,R1,power,solarPV,retrofit,2040
44,A1,6.75000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
45,A1,6.75000000000,R1,73,2035,R1,power,windturbine,retrofit,2040
0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2040
1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
2,A1,0.91000000000,R1,0,2035,R1,residential,gasboiler,retrofit,2045
4,A1,16.09000000000,R1,7,2035,R1,residential,heatpump,retrofit,2045
5,A1,31.00000000000,R1,8,2040,R1,residential,heatpump,retrofit,2045
2,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2045
3,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2045
20,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2045
21,A1,2.40000000000,R1,23,2025,R1,power,solarPV,retrofit,2045
22,A1,6.00000000000,R1,24,2030,R1,power,solarPV,retrofit,2045
23,A1,10.00000000000,R1,25,2035,R1,power,solarPV,retrofit,2045
48,A1,6.75000000000,R1,77,2020,R1,power,windturbine,retrofit,2045
49,A1,6.75000000000,R1,78,2035,R1,power,windturbine,retrofit,2045
0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2045
1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
0,A1,31.00000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
1,A1,23.00000000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2050
1,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2050
14,A1,2.40000000000,R1,22,2025,R1,power,solarPV,retrofit,2050
15,A1,6.00000000000,R1,23,2030,R1,power,solarPV,retrofit,2050
16,A1,10.00000000000,R1,24,2035,R1,power,solarPV,retrofit,2050
17,A1,16.91000000000,R1,25,2045,R1,power,solarPV,retrofit,2050
42,A1,6.75000000000,R1,77,2035,R1,power,windturbine,retrofit,2050
43,A1,3.56000000000,R1,78,2045,R1,power,windturbine,retrofit,2050
0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2050
1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
technology,dst_region,region,agent,sector,type,year,capacity
gasboiler,R1,R1,A1,residential,retrofit,2020,10.00000000000
gasCCGT,R1,R1,A1,power,retrofit,2020,1.00000000000
gassupply1,R1,R1,A1,gas,retrofit,2020,15.00000000000
gasboiler,R1,R1,A1,residential,retrofit,2025,5.00000000000
heatpump,R1,R1,A1,residential,retrofit,2025,19.00000000000
gasCCGT,R1,R1,A1,power,retrofit,2025,1.00000000000
solarPV,R1,R1,A1,power,retrofit,2025,10.00000000000
windturbine,R1,R1,A1,power,retrofit,2025,6.75000000000
gassupply1,R1,R1,A1,gas,retrofit,2025,15.00000000000
gasboiler,R1,R1,A1,residential,retrofit,2030,4.10000000000
heatpump,R1,R1,A1,residential,retrofit,2030,19.00000000000
heatpump,R1,R1,A1,residential,retrofit,2030,6.90000000000
gasCCGT,R1,R1,A1,power,retrofit,2030,3.00000000000
solarPV,R1,R1,A1,power,retrofit,2030,10.00000000000
solarPV,R1,R1,A1,power,retrofit,2030,2.40000000000
windturbine,R1,R1,A1,power,retrofit,2030,6.75000000000
gassupply1,R1,R1,A1,gas,retrofit,2030,7.50000000000
gassupply1,R1,R1,A1,gas,retrofit,2030,2.79440000000
gasboiler,R1,R1,A1,residential,retrofit,2035,4.10000000000
heatpump,R1,R1,A1,residential,retrofit,2035,6.90000000000
heatpump,R1,R1,A1,residential,retrofit,2035,25.00000000000
gasCCGT,R1,R1,A1,power,retrofit,2035,3.00000000000
solarPV,R1,R1,A1,power,retrofit,2035,10.00000000000
solarPV,R1,R1,A1,power,retrofit,2035,2.40000000000
solarPV,R1,R1,A1,power,retrofit,2035,6.00000000000
windturbine,R1,R1,A1,power,retrofit,2035,6.75000000000
gassupply1,R1,R1,A1,gas,retrofit,2035,2.79440000000
gassupply1,R1,R1,A1,gas,retrofit,2035,7.50000000000
gasboiler,R1,R1,A1,residential,retrofit,2040,0.91000000000
heatpump,R1,R1,A1,residential,retrofit,2040,25.00000000000
heatpump,R1,R1,A1,residential,retrofit,2040,16.09000000000
gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
gasCCGT,R1,R1,A1,power,retrofit,2040,0.72440000000
solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
solarPV,R1,R1,A1,power,retrofit,2040,2.40000000000
solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
windturbine,R1,R1,A1,power,retrofit,2040,6.75000000000
windturbine,R1,R1,A1,power,retrofit,2040,6.75000000000
gassupply1,R1,R1,A1,gas,retrofit,2040,2.79440000000
gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
gasboiler,R1,R1,A1,residential,retrofit,2045,0.91000000000
heatpump,R1,R1,A1,residential,retrofit,2045,16.09000000000
heatpump,R1,R1,A1,residential,retrofit,2045,31.00000000000
gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
gasCCGT,R1,R1,A1,power,retrofit,2045,0.72440000000
solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
solarPV,R1,R1,A1,power,retrofit,2045,2.40000000000
solarPV,R1,R1,A1,power,retrofit,2045,6.00000000000
solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
windturbine,R1,R1,A1,power,retrofit,2045,6.75000000000
windturbine,R1,R1,A1,power,retrofit,2045,6.75000000000
gassupply1,R1,R1,A1,gas,retrofit,2045,2.79440000000
gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
gasCCGT,R1,R1,A1,power,retrofit,2050,0.72440000000
solarPV,R1,R1,A1,power,retrofit,2050,2.40000000000
solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
solarPV,R1,R1,A1,power,retrofit,2050,10.00000000000
solarPV,R1,R1,A1,power,retrofit,2050,16.91000000000
windturbine,R1,R1,A1,power,retrofit,2050,6.75000000000
windturbine,R1,R1,A1,power,retrofit,2050,3.56000000000
gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
Loading