Skip to content

Commit 9e9e7b9

Browse files
authored
Merge pull request #554 from EnergySystemsModellingLab/v1.3
MUSE version 1.3.0
2 parents 07b39a3 + 64e55a9 commit 9e9e7b9

File tree

79 files changed

+1678
-5232
lines changed

Some content is hidden

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

79 files changed

+1678
-5232
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.2.3
2+
current_version = 1.3.0
33
commit = True
44
tag = True
55

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
os: [ubuntu-latest, macos-latest, windows-latest]
1818
# Test with the earliest and the latest python versions supported
19-
python-version: ["3.9", "3.12"]
19+
python-version: ["3.9", "3.13"]
2020

2121
steps:
2222
- uses: actions/checkout@v4
@@ -59,7 +59,7 @@ jobs:
5959
matrix:
6060
os: [ubuntu-latest, macos-latest, windows-latest]
6161
# Test with the earliest and the latest python versions supported
62-
python-version: ["3.9", "3.12"]
62+
python-version: ["3.9", "3.13"]
6363

6464
steps:
6565
- uses: actions/checkout@v4

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Python
1414
uses: actions/setup-python@v5
1515
with:
16-
python-version: 3.12
16+
python-version: 3.13
1717
- name: Install dependencies
1818
run: |
1919
sudo apt update -y

CHANGELOG.md

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

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.2.3
13-
date-released: 2024-11-19
12+
version: v1.3.0
13+
date-released: 2024-12-03

docs/api.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ PresetSector
5555
.. autoclass:: muse.sectors.preset_sector.PresetSector
5656
:members:
5757

58-
LegacySector
59-
~~~~~~~~~~~~
60-
61-
.. autoclass:: muse.sectors.legacy_sector.LegacySector
62-
:members:
6358

6459
Production
6560
~~~~~~~~~~

docs/application-flow.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,11 +503,9 @@ The dispatch stage when running a sector can be described by the following graph
503503

504504
After the investment stage is completed, then the new capacity of the sector is obtained by aggregating the assets of all agents of the sector. Then, the supply of commodities is calculated as requested by the ``dispatch_production`` argument defined for each sector in the ``settings.toml`` file.
505505

506-
The typical choice used in most examples in MUSE is ``share``, where the utilization across similar assets is the same in percentage. However, there are other options available, like
507-
508-
- ``costed``: assets are ranked by their levelised costs and the cheaper ones are allowed to service the demand first up to their maximum production. Minimum service can be imposed if present.
506+
There are two possible options for ``dispatch_production`` built into MUSE:
507+
- ``share``: assets each supply a proportion of demand based on their share of total capacity.
509508
- ``maximum``: all the assets dispatch their maximum production, regardless of the demand.
510-
- ``match``: supply matches the demand within the constrains on how much an asset can produce while minimizing the overall associated costs. ``match`` allows the choice between different metrics to rank assets, such as levelised costs and gross margin. See :py:mod:`muse.demand_matching` for the mathematical details.
511509

512510
Once the supply is obtained, the consumed commodities required to achieve that production level are calculated. The cheapest fuel for flexible technologies is used.
513511

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
project = "MUSE"
1212
copyright = "2024, Imperial College London"
1313
author = "Imperial College London"
14-
release = "1.2.3"
14+
release = "1.3.0"
1515
version = ".".join(release.split(".")[:2])
1616

1717
# -- General configuration ---------------------------------------------------
@@ -63,7 +63,7 @@
6363

6464
# -- Options for HTML output -------------------------------------------------
6565

66-
html_theme = "classic"
66+
html_theme = "sphinx_rtd_theme"
6767

6868
# -- Render GitHub links -------------------------------------------------
6969

0 commit comments

Comments
 (0)