Skip to content

Commit 6517b81

Browse files
tsmblandtsmbland
authored
Merge branch 'main' into outputs
2 parents fe8bb72 + 0429239 commit 6517b81

File tree

64 files changed

+2998
-2775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2998
-2775
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ repos:
99
- id: trailing-whitespace
1010
- id: end-of-file-fixer
1111
- repo: https://github.com/astral-sh/ruff-pre-commit
12-
rev: v0.9.2
12+
rev: v0.9.4
1313
hooks:
1414
- id: ruff-format
1515
types_or: [python, pyi, jupyter]
1616
- id: ruff
1717
types_or: [python, pyi, jupyter]
1818
args: [--fix]
1919
- repo: https://github.com/igorshubovych/markdownlint-cli
20-
rev: v0.43.0
20+
rev: v0.44.0
2121
hooks:
2222
- id: markdownlint-fix
2323
- repo: https://github.com/kynan/nbstripout
@@ -36,7 +36,7 @@ repos:
3636
- id: pretty-format-toml
3737
args: [--autofix, --indent, "4", --no-sort]
3838
- repo: https://github.com/codespell-project/codespell
39-
rev: v2.3.0
39+
rev: v2.4.1
4040
hooks:
4141
- id: codespell
4242
args: [--ignore-words, .codespell_ignore.txt]

‎.vscode/launch.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
"module": "muse",
1919
"args": ["--model", "default_retro"]
2020
},
21+
{
22+
"name": "Model: default_adhoc",
23+
"type": "debugpy",
24+
"request": "launch",
25+
"module": "muse",
26+
"args": ["--model", "default_adhoc"]
27+
},
2128
{
2229
"name": "Model: multiple_agents",
2330
"type": "debugpy",

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ authors:
99
given-names: Adam
1010

1111
title: MUSE_OS
12-
version: v1.3.1
13-
date-released: 2024-12-19
12+
version: v1.3.2
13+
date-released: 2025-1-22

‎docs/release-notes/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ To update to the latest version, run `pip install --upgrade muse-os`
88
.. toctree::
99
:maxdepth: 1
1010

11+
v1.3.2
1112
v1.3.1
1213
v1.3.0
1314
v1.2.3

‎docs/release-notes/v1.3.2.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Release notes for MUSE v1.3.2 (January 22, 2025)
2+
3+
These are the main changes in MUSE v1.3.2.
4+
5+
## Bug fixes
6+
7+
### Fixed error with the calculation of LCOE ({github}`633`)
8+
9+
- There was an error with the way that LCOE was calculated, which was artificially inflating commodity prices in timeslices with lower levels of production. This is now fixed.
10+
11+
### Fixed incorrect installed year in capacity results ({github}`628`)
12+
13+
- The "installed" column (the year that an asset was installed) was previously incorrect, and has now been fixed.
14+
15+
## Deprecated features
16+
17+
### Dropping the "cvxopt" solver ({github}`622`)

‎docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv‎

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,48 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
33
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
44
A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
55
A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
6-
A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
6+
A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2025
77
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
8-
A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2025
8+
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2025
99
A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
10-
A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
11-
A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
12-
A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
13-
A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2030
10+
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2025
11+
A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2030
12+
A1,5.66060000000,R1,2030,R1,residential,heatpump,newcapa,2030
13+
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2030
14+
A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2030
1415
A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
15-
A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
16-
A1,12.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
17-
A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
18-
A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
19-
A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
20-
A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2035
21-
A1,12.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
22-
A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
23-
A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
24-
A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
25-
A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
26-
A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2040
27-
A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
28-
A1,12.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
29-
A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
30-
A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
31-
A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
32-
A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
33-
A1,12.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
34-
A1,7.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
35-
A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
36-
A1,10.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
37-
A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
38-
A1,1.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
39-
A1,5.01000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
16+
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2030
17+
A1,5.66060000000,R1,2030,R1,residential,heatpump,newcapa,2035
18+
A1,12.35690000000,R1,2035,R1,residential,heatpump,newcapa,2035
19+
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2035
20+
A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2035
21+
A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2035
22+
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2035
23+
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2035
24+
A1,12.35690000000,R1,2035,R1,residential,heatpump,newcapa,2040
25+
A1,6.15260000000,R1,2040,R1,residential,heatpump,newcapa,2040
26+
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2040
27+
A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2040
28+
A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2040
29+
A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2040
30+
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2040
31+
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2040
32+
A1,6.15260000000,R1,2040,R1,residential,heatpump,newcapa,2045
33+
A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2045
34+
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2045
35+
A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2045
36+
A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2045
37+
A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045
38+
A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045
39+
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045
40+
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
41+
A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050
42+
A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050
43+
A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050
44+
A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050
45+
A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050
46+
A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050
47+
A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050
48+
A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050
49+
A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050
50+
A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050

0 commit comments

Comments
 (0)