Skip to content

Commit

Permalink
Merge pull request #554 from EnergySystemsModellingLab/v1.3
Browse files Browse the repository at this point in the history
MUSE version 1.3.0
  • Loading branch information
tsmbland authored Dec 3, 2024
2 parents 07b39a3 + 64e55a9 commit 9e9e7b9
Show file tree
Hide file tree
Showing 79 changed files with 1,678 additions and 5,232 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.3
current_version = 1.3.0
commit = True
tag = True

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
# Test with the earliest and the latest python versions supported
python-version: ["3.9", "3.12"]
python-version: ["3.9", "3.13"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
# Test with the earliest and the latest python versions supported
python-version: ["3.9", "3.12"]
python-version: ["3.9", "3.13"]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.13
- name: Install dependencies
run: |
sudo apt update -y
Expand Down
91 changes: 0 additions & 91 deletions CHANGELOG.md

This file was deleted.

4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ authors:
given-names: Adam

title: MUSE_OS
version: v1.2.3
date-released: 2024-11-19
version: v1.3.0
date-released: 2024-12-03
5 changes: 0 additions & 5 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ PresetSector
.. autoclass:: muse.sectors.preset_sector.PresetSector
:members:

LegacySector
~~~~~~~~~~~~

.. autoclass:: muse.sectors.legacy_sector.LegacySector
:members:

Production
~~~~~~~~~~
Expand Down
6 changes: 2 additions & 4 deletions docs/application-flow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -503,11 +503,9 @@ The dispatch stage when running a sector can be described by the following graph

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.

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

- ``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.
There are two possible options for ``dispatch_production`` built into MUSE:
- ``share``: assets each supply a proportion of demand based on their share of total capacity.
- ``maximum``: all the assets dispatch their maximum production, regardless of the demand.
- ``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.

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

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
project = "MUSE"
copyright = "2024, Imperial College London"
author = "Imperial College London"
release = "1.2.3"
release = "1.3.0"
version = ".".join(release.split(".")[:2])

# -- General configuration ---------------------------------------------------
Expand Down Expand Up @@ -63,7 +63,7 @@

# -- Options for HTML output -------------------------------------------------

html_theme = "classic"
html_theme = "sphinx_rtd_theme"

# -- Render GitHub links -------------------------------------------------

Expand Down
Loading

0 comments on commit 9e9e7b9

Please sign in to comment.