Skip to content

Commit 74f4d26

Browse files
committed
Merge branch 'master-upstream-oet' into merge-upstream-01-07
2 parents bdf8535 + 03a4149 commit 74f4d26

16 files changed

Lines changed: 458 additions & 407 deletions

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,8 @@ merger-todos.md
8585
*.html
8686
# private dev folder
8787
dev/*
88+
89+
# ai coding tools
90+
CLAUDE.md
91+
.claude/
92+
.github/copilot-instructions.md

doc/release_notes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Release Notes
3737
.. Upcoming PyPSA-Eur Release
3838
.. ================
3939
40+
* Fix: Invalid aquifer shape geometries are now fixed in `build_ates_potentials.py` (fixing https://github.com/PyPSA/pypsa-eur/issues/1696)
41+
4042
* Fix: Sanitize columns in `add_brownfield` as it's done for `add_exisiting_baseyear` (https://github.com/PyPSA/pypsa-eur/pull/1676).
4143

4244
* (Breaking) Consolidate gap-filling strategies options under a new configuration section `load:fill_gaps` and add a switch (https://github.com/PyPSA/pypsa-eur/pull/1677). The options `load:interpolate_limit` and `load:time_shift_for_large_gaps` are now located under `load:fill_gaps` as `load:fill_gaps:interpolate_limit` and `load:fill_gaps:time_shift_for_large_gaps`.

0 commit comments

Comments
 (0)