Merge branch 'master' into update-eia-hydro-data

.github/workflows/update-pinned-env.yaml

@@ -83,5 +83,8 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update-pinned-environment
         title: "[github-actions.ci] Update pinned envs"
-        body: "Automatically generated PR to update pinned environment files for Windows, macOS, and Linux."
+        body: |
+          Automatically generated PR to update pinned environment files for Windows, macOS, and Linux.
+
+          **Note: Do not merge without manual test execution. Either update the branch to trigger tests, or use `workflow_dispatch` to run tests manually. Unlike standard PRs, tests will not run automatically.**
         commit-message: "Update pinned environment files for all platforms"

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.9.4
+  rev: v0.9.6
   hooks:
     # Run the linter.
   - id: ruff

config/config.default.yaml

@@ -482,16 +482,9 @@ sector:
       heat_exchanger_pinch_point_temperature_difference: 5 #K
       isentropic_compressor_efficiency: 0.8
       heat_loss: 0.0
-    heat_utilisation_potentials:
+    limited_heat_sources:
       geothermal:
-        # activate for 85C hydrothermal
-        # key: hydrothermal_85
-        # constant_temperature_celsius: 85
-        key: hydrothermal_65
         constant_temperature_celsius: 65
-        column_name: Energy_TWh
-        unit: TWh
-        full_load_hours: 4000
     direct_utilisation_heat_sources:
     - geothermal
   heat_pump_sources:

doc/configtables/sector.csv

@@ -23,13 +23,9 @@ district_heating,--,,`prepare_sector_network.py <https://github.com/PyPSA/pypsa-
 -- -- heat_exchanger_pinch_point_temperature_difference,K,float,Heat pump pinch point temperature difference in heat exchangers assumed for approximation.
 -- -- isentropic_compressor_efficiency,--,float,Isentropic efficiency of heat pump compressor assumed for approximation. Must be between 0 and 1.
 -- -- heat_loss,--,float,Heat pump heat loss assumed for approximation. Must be between 0 and 1.
--- heat_utilisation_potentials,--,Dictionary with names of heat sources for which data by Fraunhofer ISI (`Manz et al. 2024 <https://www.sciencedirect.com/science/article/pii/S0960148124001769>) should be used,
+-- limited_heat_sources,--,Dictionary with names of limited heat sources (not air) for which data by Fraunhofer ISI (`Manz et al. 2024 <https://www.sciencedirect.com/science/article/pii/S0960148124001769>) is used,
 -- -- geothermal,-,Name of the heat source. Must be the same as in ``heat_pump_sources``,
--- -- -- key,-,string used to complete URL for data download - e.g. `geothermal_65` or `geothermal_85`","i.e file names in `Fordatis <https://fordatis.fraunhofer.de/handle/fordatis/341.3?mode=simple>`"
--- -- -- constant_temperature_celsius,C,heat source temperature,
--- -- -- column_name,-,name of the data column in retrieved GeoDataFrame,
--- -- -- unit,-,unit of heat source potential must be in (K/M/G/T)Wh,
--- -- -- full_load_hours,h,assumed full-load hours in Manz et al. (used to scale from utilisation to technical potential),
+-- -- -- constant_temperature_celsius,°C,heat source temperature,
 -- direct_utilisation_heat_sources,--,List of heat sources for direct heat utilisation in district heating. Must be in the keys of `heat_utilisation_potentials` (e.g. ``geothermal``),
 -- heat_pump_sources,--,,
 -- -- urban central,--,List of heat sources for heat pumps in urban central heating,

doc/release_notes.rst

@@ -11,7 +11,9 @@ Release Notes
 Upcoming Release
 ================
 
-- Added option to specify the cutout directory in the configuration file. This allows to the user to specify the directory where the cutouts are stored. Use it by setting ``atlite: cutout_directory:`` in the configuration file. (https://github.com/PyPSA/pypsa-eur/pull/1515)
+* Bugfix: Geothermal heat potentials are now restricted to those in close proximity to future district heating areas as projected by Manz et al. 2024. Includes a refactoring change: Building of generic technical potentials from heat utilisation potentials was changed to specific computation of geothermal heat potentials.
+
+- ...
 
 - Bug fix: Added setting ``run: use_shadow_directory:`` (default: ``true``) which sets the ``shadow`` parameter of the snakemake workflow. Configuring to ``true`` sets snakemake ``shadow`` parameter to ``shalloow``, ``false`` to `Ǹone``. Should be set to ``false`` for those cases, where snakemake has an issue with finding missing input/output files in solving rules.
 

envs/linux-pinned.yaml

@@ -47,6 +47,8 @@ dependencies:
   - azure-storage-files-datalake-cpp=12.12.0
   - babel=2.17.0
   - beautifulsoup4=4.13.3
+  - blas=2.129
+  - blas-devel=3.9.0
   - bleach=6.2.0
   - bleach-with-css=6.2.0
   - blosc=1.21.6
@@ -58,14 +60,14 @@ dependencies:
   - brotli-python=1.1.0
   - bzip2=1.0.8
   - c-ares=1.34.4
-  - c-blosc2=2.15.2
+  - c-blosc2=2.16.0
   - ca-certificates=2025.1.31
   - cached-property=1.5.2
   - cached_property=1.5.2
   - cairo=1.18.2
   - cartopy=0.24.0
   - cdsapi=0.7.5
-  - certifi=2024.12.14
+  - certifi=2025.1.31
   - cffi=1.17.1
   - cfgv=3.3.1
   - cftime=1.6.4
@@ -90,8 +92,8 @@ dependencies:
   - cycler=0.12.1
   - cyrus-sasl=2.1.27
   - cytoolz=1.0.1
-  - dask=2025.1.0
-  - dask-core=2025.1.0
+  - dask=2025.2.0
+  - dask-core=2025.2.0
   - datapi=0.2.0
   - datrie=0.8.2
   - dav1d=1.2.1
@@ -103,9 +105,9 @@ dependencies:
   - descartes=1.1.0
   - dill=0.3.9
   - distlib=0.3.9
-  - distributed=2025.1.0
+  - distributed=2025.2.0
   - docutils=0.21.2
-  - double-conversion=3.3.0
+  - double-conversion=3.3.1
   - dpath=2.2.0
   - entsoe-py=0.6.18
   - epoxy=1.5.10
@@ -218,7 +220,7 @@ dependencies:
   - libclang13=19.1.7
   - libcrc32c=1.1.2
   - libcups=2.3.3
-  - libcurl=8.11.1
+  - libcurl=8.12.1
   - libde265=1.0.15
   - libdeflate=1.23
   - libdrm=2.4.124
@@ -227,26 +229,26 @@ dependencies:
   - libev=4.33
   - libevent=2.1.12
   - libexpat=2.6.4
-  - libffi=3.4.2
+  - libffi=3.4.6
   - libgcc=14.2.0
   - libgcc-ng=14.2.0
   - libgd=2.3.3
-  - libgdal-core=3.10.1
-  - libgdal-hdf4=3.10.1
-  - libgdal-hdf5=3.10.1
-  - libgdal-netcdf=3.10.1
+  - libgdal-core=3.10.2
+  - libgdal-hdf4=3.10.2
+  - libgdal-hdf5=3.10.2
+  - libgdal-netcdf=3.10.2
   - libgfortran=14.2.0
   - libgfortran-ng=14.2.0
   - libgfortran5=14.2.0
   - libgl=1.7.0
   - libglib=2.82.2
   - libglvnd=1.7.0
   - libglx=1.7.0
-  - libgomp=14.2.0
-  - libgoogle-cloud=2.34.0
-  - libgoogle-cloud-storage=2.34.0
+  - libgoogle-cloud=2.35.0
+  - libgoogle-cloud-storage=2.35.0
   - libgrpc=1.67.1
   - libheif=1.19.5
+  - libhwloc=2.11.2
   - libiconv=1.17
   - libjpeg-turbo=3.0.0
   - libkml=1.3.0
@@ -265,14 +267,14 @@ dependencies:
   - libparquet=19.0.0
   - libpciaccess=0.18
   - libpng=1.6.46
-  - libpq=17.2
+  - libpq=17.3
   - libprotobuf=5.28.3
   - libre2-11=2024.07.02
   - librsvg=2.58.4
   - librttopo=1.1.0
   - libsodium=1.0.20
   - libspatialite=5.1.0
-  - libsqlite=3.49.0
+  - libsqlite=3.48.0
   - libssh2=1.11.1
   - libstdcxx=14.2.0
   - libstdcxx-ng=14.2.0
@@ -288,9 +290,10 @@ dependencies:
   - libxslt=1.1.39
   - libzip=1.11.2
   - libzlib=1.3.1
-  - linopy=0.4.4
+  - linopy=0.5.0
+  - llvm-openmp=19.1.7
   - locket=1.0.0
-  - lxml=5.3.0
+  - lxml=5.3.1
   - lz4=4.3.3
   - lz4-c=1.10.0
   - lzo=2.10
@@ -303,6 +306,7 @@ dependencies:
   - memory_profiler=0.61.0
   - minizip=4.0.7
   - mistune=3.1.1
+  - mkl=2024.2.2
   - msgpack-python=1.1.0
   - multiurl=0.3.3
   - munkres=1.1.4
@@ -317,15 +321,16 @@ dependencies:
   - networkx=3.4.2
   - nlohmann_json=3.11.3
   - nodeenv=1.9.1
-  - nomkl=1.0
+  - nomkl=3.0
   - notebook=7.3.2
   - notebook-shim=0.2.4
   - numexpr=2.10.2
   - numpy=1.26.4
+  - openblas=0.3.28
   - openjpeg=2.5.3
   - openldap=2.6.9
   - openpyxl=3.1.5
-  - openssl=3.4.0
+  - openssl=3.4.1
   - orc=2.0.3
   - overrides=7.7.0
   - packaging=24.2
@@ -368,14 +373,14 @@ dependencies:
   - pylint=3.3.4
   - pyogrio=0.10.0
   - pyparsing=3.2.1
-  - pyproj=3.7.0
+  - pyproj=3.7.1
   - pypsa=0.33.0
   - pyshp=2.3.1
   - pyside6=6.8.2
   - pysocks=1.7.1
   - pytables=3.10.2
   - pytest=8.3.4
-  - python=3.12.8
+  - python=3.12.9
   - python-dateutil=2.9.0.post0
   - python-fastjsonschema=2.21.1
   - python-json-logger=2.0.7
@@ -399,7 +404,7 @@ dependencies:
   - rfc3986-validator=0.1.1
   - rioxarray=0.18.2
   - rpds-py=0.22.3
-  - ruff=0.9.5
+  - ruff=0.9.6
   - s2n=1.5.11
   - scikit-learn=1.6.1
   - scipy=1.15.1
@@ -410,7 +415,7 @@ dependencies:
   - shapely=2.0.7
   - six=1.17.0
   - smart_open=7.1.0
-  - smmap=5.0.0
+  - smmap=5.0.1
   - snakemake-interface-common=1.17.4
   - snakemake-interface-executor-plugins=9.3.3
   - snakemake-interface-report-plugins=1.1.0
@@ -421,11 +426,12 @@ dependencies:
   - snuggs=1.4.7
   - sortedcontainers=2.4.0
   - soupsieve=2.5
-  - sqlite=3.49.0
+  - sqlite=3.48.0
   - stack_data=0.6.3
   - statsmodels=0.14.4
   - svt-av1=2.3.0
   - tabulate=0.9.0
+  - tbb=2021.13.0
   - tblib=3.0.0
   - terminado=0.18.1
   - threadpoolctl=3.5.0
@@ -450,7 +456,7 @@ dependencies:
   - uriparser=0.9.8
   - urllib3=2.3.0
   - validators=0.34.0
-  - virtualenv=20.29.1
+  - virtualenv=20.29.2
   - wayland=1.23.1
   - wcwidth=0.2.13
   - webcolors=24.11.1
@@ -493,7 +499,7 @@ dependencies:
   - zict=3.0.0
   - zipp=3.21.0
   - zlib=1.3.1
-  - zlib-ng=2.2.3
+  - zlib-ng=2.2.4
   - zstandard=0.23.0
   - zstd=1.5.6
   - pip:
@@ -504,7 +510,7 @@ dependencies:
       - pyscipopt==5.3.0
       - requests-oauthlib==1.3.1
       - snakemake-executor-plugin-cluster-generic==1.0.9
-      - snakemake-executor-plugin-slurm==0.15.0
+      - snakemake-executor-plugin-slurm==0.15.1
       - snakemake-executor-plugin-slurm-jobstep==0.2.1
       - snakemake-storage-plugin-http==0.2.3
       - tsam==2.3.6