Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge development branch into the master branch #53

Merged
merged 99 commits into from
Feb 27, 2025

Conversation

daniel-rdt
Copy link
Collaborator

@daniel-rdt daniel-rdt commented Jan 17, 2025

This PR merges all changes from the development branch for the FE project into the Master branch of the project repository for final project repository release.

The changes and features introduced in this project by this PR consist of:

Model Features for Energy Storage Technologies

Model Adjustment Features

Model Visualization Features

Model Documentation Features

Bugfixes

Checklist

  • I tested my contribution locally and it works as intended.
  • Code and workflow changes are sufficiently documented.
  • Changed dependencies are added to envs/environment.yaml.
  • Changes in configuration options are added in config/config.default.yaml.
  • Changes in configuration options are documented in doc/configtables/*.csv.
  • Sources of newly added data are documented in doc/data_sources.rst.
  • A release note doc/release_notes.rst is added.

daniel-rdt and others added 30 commits October 22, 2024 16:50
… of storages as either Stores or StorageUnits (#15)

* add structure in prepare_sector_network.py to specify implementation of storages as either Stores or StorageUnits

* add doc configtables entry

* Fix reference issue in make_summary using prepare_costs

* Add config_provider declaration for max_hours

* add check for available storage techs in add_storageunits

---------

Co-authored-by: daniel.rdt <daniel.ruedt@campus.tu-berlin.de>
Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org>
…eUnit or Store (#20)

* add iron-air battery as storage technology with implementation as StorageUnit or Store in prepare_sector_network.py

* change nomenclature for lithium-ion batteries from battery to li-ion battery

* update release notes

---------

Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org>
…nologies (#18)

* add different max hour archetypes for StorageUnits

* add max hours as list in default config

* add deprecation warnings and cast float max_hours to list

* adjust adding only storage technologies as carriers that are implemented

---------

Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org>
…Also update of NEP upper limit and inclusion, fix of cost data at new commit
…and load_costs (#23)

* overwrite cost table attributes specified in config in prepare_costs and load_costs

* add custom fuel prices from EEE project

---------

Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org>
)

* add lfp, vanadium, lair, pair battery types. No final colors yet

* readjust config.form.yaml, overwrites efficiency for CAES and investment for Iron-Air Battery

---------

Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com>
…PSA#1423)

Moreover, V2G is now only enabled if demand-side-management (DSM) is also
enabled; V2G had no effect without DSM anyway.

Finally, rename the `bev_availability` option to
`bev_dsm_availability` to avoid confusion with time-dependent BEV
charge/discharge availability profiles, which are also referred to as
`bev_availability` elsewhere.
…ies_to_plotting

add new battery techs to nice names and plotting for cost map
…pacities-bug-fix

Feature/nuclear capacities bug fix
daniel-rdt and others added 21 commits February 6, 2025 11:47
* Add option to disable CHP in the final adjustment

* add DE for clarification

* add logger
* add filter_year for adding transmission projects

* add documentation and default value
Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org>
Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com>
Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com>
@daniel-rdt daniel-rdt marked this pull request as ready for review February 24, 2025 10:05
virio-andreyana and others added 6 commits February 27, 2025 14:14
…add csvs

* add extract curtailment, create notebook with scenarios comparison

* all plots automaticly save an csvs counterpart

* add csvs as snakemake output

* disaggregate marginal cost of fossil fuels

* add csvs to all map plots and save line loading max plots and fix in line loading calculation

* disaggregate by bus, add capital and operational cost

---------

Co-authored-by: daniel-rdt <daniel.ruedt@openenergytransition.org>
@daniel-rdt daniel-rdt merged commit 7a5786e into master Feb 27, 2025
3 checks passed
@daniel-rdt daniel-rdt deleted the form_energy_storage_dev branch February 27, 2025 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants