Conversation
…st (#1717) * feat: include existing capacities only for included renewable carriers * bugfix: only add solar rooftop in distribution grid when solar included in config * revert mock snakemake changes * refactor: change to if not continue style to reduce diff
* fix: ensure aquifer geometries are valid in build_ates_potentials.py * fix: add release note for fixing invalid aquifer shape geometries in build_ates_potentials.py
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
…1733) This reverts commit d077398.
* Update locked environment files for all platforms * fix(deps): pin `xarray<2025.07.0` * Revert "Update locked environment files for all platforms" This reverts commit 9bcdd4133ea4174a4d059bea2e817bcbbb4ef413. --------- Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com> Co-authored-by: lkstrp <lkstrp@pm.me>
Co-authored-by: lkstrp <62255395+lkstrp@users.noreply.github.com>
* chore: Replace deprecated dep5 * code: Move licence identifier into appropriate file * Update release_notes.rst
updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.8 → v0.12.2](astral-sh/ruff-pre-commit@v0.11.8...v0.12.2) - [github.com/macisamuele/language-formatters-pre-commit-hooks: v2.14.0 → v2.15.0](macisamuele/language-formatters-pre-commit-hooks@v2.14.0...v2.15.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Bug fix for MultiLineStrings * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Reverted to absolute paths * Reverted to absolute paths * Fix absolute import path --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* feat: make config.yaml optional * feat: make rulegraph compatible with snakemake 9.7.1 * doc: add release note
* fix: forward heat_pump_cop_approximation config to CentralHeatingCopApproximator * refactor: set correct heat source for ptes boosting and include titel/link to source for min_delta_t_lift --------- Co-authored-by: Amos Schledorn <60692940+amos-schledorn@users.noreply.github.com>
…e configtables (#1727) * Add offwind float to CCL * Update plot_hydrogen_network.py Fix the code to plot the storage * Update release_notes.rst * Update solving.csv Add precision for the CCL constraint (not working with a time resolution higher than 1h) + add indication on how to use agg_p_nom_limits
* allow country-specific district heating potentials * fix: handle missing district heating potential for countries * docs: add comments to enhance comprehensibility --------- Co-authored-by: cpschau <caspar.schauss@ieg.fraunhofer.de> Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
* prepare release v2025.07.0 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * simplify CI tests --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* feat: enable bidding zone download and cluster by busshapes * first draft of mapping nuts3 to bidding zones * include bidding zone as administrative level * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * refac: remove unneeded functions * feat: apply review suggestions Co-authored-by: Thomas Gilon <thomas.gilon@openenergytransition.org> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: allow to skip detached islands without substation in base_network fix: return type in build_bidding_zones * fix: correct typo for UKNI * test: improve test configuration file * Add across_borders option to remove_stubs * doc: describe retrieve_bidding_zones.py and build_bidding_zones.py and add release note * Apply suggestions from code review Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de> * feat: fix raw shapefiles version for reproducibility * code: make bidding_zones an optional argument in sm rules and improve retrieve rule * feat: add an option to optionally exclude some islands and merge bidding zones to tyndp level * feat: define UKNI and IE as a single bidding zone * feat: add a function to snap borders when replacing a country * doc: improve readibility of the code * feat: remove holes in shapes file * fix: disable reassign if no bidding zones * refactor: refactor the cluster name in busmap_from_shapes * feat: generalize copperplate_regions option * ci: fix wildcard error in retrieve_bidding_zones * doc: improve release note * Include electricity reference grid (#18) * Introduce build_tyndp_network * Improve compatibility with base_network * Fix scenario behaviour * Add basic mapping for Luxemburg * Handle exceptions for corsica, northern ireland and crete * Add rule in makefile * Fix typo * Improve shape file for Norway and Luxembourg * Fix join to keep added regions from shape * Add plot_base_network * Improve documentation of plot_base_network * Assume some nodes to be co-located in the reference grid * Add Malta * Improve makefile * Improve H2 buses location * Improve H2 buses location * Add virtual nodes in Italy * Harmonize configuration * Add arguments to makefile * Warn before dropping links connected to unknown buses * Remove Kosovo from the country list * Generalize naming convention in base_network * Fix type issue with empty dataframe in base_network * Harmonize configuration * Disable transmission projects * Ignore CY and MT in synthetic demand data * Skip cluster network with TYNDP base network * Skip load upsampling for missing countries * Refine assumptions for ITCO and ITVI * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update configuration file to use administrative clustering * Update makefile to use the new dag rules * ci: fix ci configuration and tests * feat: make build tyndp compatible with the new shape file * test: remove plotting from the test * feat: bring in bidding zones constructor from upstream pr * code: improve configuration set * doc: add a release note * test: improve cleaning rule for tests * chore: use tyndp-raw as first * ci: refactor function names and remove unused column for unit tests * ci: try to solve online tests * Revert "ci: try to solve online tests" This reverts commit 8871381e9b45b8b3ce80f1729cdc5eb712408d33. * code: add logging to the retrieve_bidding_zones rule * ci: fix environment names to pass ci * code: remove scenarios to simplify configurations * Retrieve data from TYNDP bundle (#15) * add retrieve rule and script to retrieve TYNDP data bundle from Zenodo * Improve doc string * Add data retrieve as default for tyndp * Shorten folder name --------- Co-authored-by: daniel-rdt <daniel.ruedt@openenergytransition.org> (cherry picked from commit 5e879161920cb93af292469988cc084d86dea171) * Fix data bundle URL (cherry picked from commit d956d170aeda5ad3a5a1b0bc69a1cce5919330e9) * code: fix configuration for reference grid * code: improve snakemake configuration for retrieve_tyndp_bundle * code: revert converter dc boolean * Apply suggestions from code review Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com> * doc: add to do in scripts/build_tyndp_network.py Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com> --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com> # Conflicts: # Makefile # doc/release_notes.rst # rules/build_electricity.smk # scripts/build_bidding_zones.py # scripts/cluster_network.py # scripts/retrieve_bidding_zones.py * chore: clean the cherry pick from open-tyndp * feat: create default behaviour for tyndp-raw * feat: enable more granular set of countries * ci: improve ci test * doc: fix merge issue with release note * doc: improve release note * doc: add new rules to documentation * ci: improve test configuration * doc: add new rules to documentation * refactor: use logger consistently * ci: update config file to use default cutout and disable shared resources * ci: fix path for tyndp test file * refactor: switch to original data source for reference grid data * test: use rule name in test * fix: correct if clause to avoid DC lossy_lossy_bidirectional_links * doc: improve verbositiy of logger * refactor: switch base network name from tyndp-raw to tyndp * feat: ignore errors when retrieving data bundle * feat: remove unnecessary clustering limitation * Apply suggestions from code review * doc: add tyndp 2024 in data sources --------- Co-authored-by: Fabian <fab.hof@gmx.de> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de> Co-authored-by: Daniel Rüdt <117752024+daniel-rdt@users.noreply.github.com> Co-authored-by: Bobby Xiong <36541459+bobbyxng@users.noreply.github.com>
* fix: add base network plot in all rule * fix: bump cutouts version to access europe-2013-03-sarah3-era5.nc * fix: use mainland GB coordinates instead of Northern Ireland * refactor: remove unused config parameter from cluster_network rule * refactor: remove unused config parameter from prepare_sector_network rule * doc: adjust cutouts version in documentation * doc: fix typo * doc: improve wording in plot_base_network
… energy-to-power ratio constraints (#1769) * fix: replace ValueError with logger warnings for TES constraints when no extendable links are found and return * doc: update release notes --------- Co-authored-by: Micha <michaellindner@posteo.de>
… heating in test configs (#1766) * fixt: add heat pump sources to sector configurations and update heat source check * doc:update release notes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix: add location parameter to heat source bus --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…avoid runtime warning (#1783) Co-authored-by: cpschau <caspar.schauss@ieg.fraunhofer.de>
* doc: source bidding zone shape files * doc: improve lincenses.rst with reference to REUSE.toml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Before asking for a review for this PR make sure to complete the following checklist:
ariadne_allcompletes without errorsexport_ariadne_variableshas been adapted to the changesChangelog.mdmainhas been merged into the PRYYYYMMDDdescriptive_title