Merge branch 'master' into feature/latex-gitignore

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

@@ -4,9 +4,8 @@ on:
   push:
     paths:
     - envs/environment.yaml
-  # Run every Sunday at 5:00 UTC
   schedule:
-  - cron: "0 5 * * 0/2"    # Bi-weekly
+  - cron: "0 8 1,16 * *" # Bi-weekly
   workflow_dispatch:
 
 env:

.gitignore

@@ -77,7 +77,7 @@ merger-todos.md
 
 *.html
 
-
+# latex files
 *.aux
 *.lof
 *.log
@@ -93,4 +93,7 @@ merger-todos.md
 *.bbl
 *.blg
 *.spl
-report/*.pdf
+report/*.pdf
+
+# private dev folder
+dev/*

config/config.default.yaml

@@ -86,7 +86,7 @@ co2_budget:
 electricity:
   voltages: [220., 300., 330., 380., 400., 500., 750.]
   base_network: osm-prebuilt
-  osm-prebuilt-version: 0.5
+  osm-prebuilt-version: 0.6
   gaslimit_enable: false
   gaslimit: false
   co2limit_enable: false
@@ -480,6 +480,18 @@ sector:
       heat_exchanger_pinch_point_temperature_difference: 5 #K
       isentropic_compressor_efficiency: 0.8
       heat_loss: 0.0
+    heat_utilisation_potentials:
+      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:
     urban central:
     - air
@@ -641,7 +653,7 @@ sector:
   co2_sequestration_cost: 10
   co2_sequestration_lifetime: 50
   co2_spatial: false
-  co2network: false
+  co2_network: false
   co2_network_cost_factor: 1
   cc_fraction: 0.9
   hydrogen_underground_storage: true
@@ -828,7 +840,7 @@ industry:
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#costs
 costs:
   year: 2030
-  version: v0.9.2
+  version: v0.10.0
   social_discountrate: 0.02
   fill_values:
     FOM: 0
@@ -1229,8 +1241,11 @@ plotting:
     services urban decentral air heat pump: '#5af95d'
     services rural air heat pump: '#5af95d'
     urban central air heat pump: '#6cfb6b'
+    urban central geothermal heat pump: '#4f2144'
+    geothermal heat pump: '#4f2144'
+    geothermal heat direct utilisation: '#ba91b1'
     ground heat pump: '#2fb537'
-    residential rural ground heat pump: '#48f74f'
+    residential rural ground heat pump: '#4f2144'
     residential rural air heat pump: '#48f74f'
     services rural ground heat pump: '#5af95d'
     Ambient: '#98eb9d'

doc/configtables/electricity.csv

@@ -1,7 +1,7 @@
 ,Unit,Values,Description
 voltages,kV,"Any subset of {220., 300., 330., 380., 400., 500., 750.}",Voltage levels to consider
 base_network, --, "Any value in {'entsoegridkit', 'osm-prebuilt', 'osm-raw}", "Specify the underlying base network, i.e. GridKit (based on ENTSO-E web map extract, OpenStreetMap (OSM) prebuilt or raw (built from raw OSM data), takes longer."
-osm-prebuilt-version, --, "float, any value in range 0.1-0.5", "Choose the version of the prebuilt OSM network. Defaults to latest Zenodo release."
+osm-prebuilt-version, --, "float, any value in range 0.1-0.6", "Choose the version of the prebuilt OSM network. Defaults to latest Zenodo release."
 gaslimit_enable,bool,true or false,Add an overall absolute gas limit configured in ``electricity: gaslimit``.
 gaslimit,MWhth,float or false,Global gas usage limit
 co2limit_enable,bool,true or false,Add an overall absolute carbon-dioxide emissions limit configured in ``electricity: co2limit`` in :mod:`prepare_network`. **Warning:** This option should currently only be used with electricity-only networks, not for sector-coupled networks..

doc/configtables/sector.csv

@@ -23,6 +23,15 @@ 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,
+-- -- 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),
+-- 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,
 -- -- urban decentral,--,List of heat sources for heat pumps in urban decentral heating,
@@ -122,7 +131,7 @@ co2_sequestration_cost,currency/tCO2,float,The cost of sequestering a ton of CO2
 co2_sequestration_lifetime,years,int,The lifetime of a CO2 sequestration site
 co2_spatial,--,"{true, false}","Add option to spatially resolve carrier representing stored carbon dioxide. This allows for more detailed modelling of CCUTS, e.g. regarding the capturing of industrial process emissions, usage as feedstock for electrofuels, transport of carbon dioxide, and geological sequestration sites."
 ,,,
-co2network,--,"{true, false}",Add option for planning a new carbon dioxide transmission network
+co2_network,--,"{true, false}",Add option for planning a new carbon dioxide transmission network
 co2_network_cost_factor,p.u.,float,The cost factor for the capital cost of the carbon dioxide transmission network
 ,,,
 cc_fraction,--,float,The default fraction of CO2 captured with post-combustion capture

doc/data-base-network.rst

@@ -15,11 +15,11 @@ The map might take a moment to load. To view it in full screen, click `here <bas
 
 ``data/osm-prebuilt``
 
-- **Source:** OpenStreetMap; Xiong, B., Neumann, F., & Brown, T. (2024).
+- **Source:** OpenStreetMap; Xiong, B., Fioriti, D., Neumann, F., Riepin I. & Brown, T. (2024).
   Prebuilt Electricity Network for PyPSA-Eur based on OpenStreetMap Data (0.5)
-  [Data set]. Zenodo. https://doi.org/10.5281/zenodo.13981528
-- **Link:** https://zenodo.org/records/13981528
-- **License:** ODbL (`reference <https://zenodo.org/records/13981528>`)
+  [Data set]. Zenodo. https://doi.org/10.5281/zenodo.14144752
+- **Link:** https://zenodo.org/records/14144752
+- **License:** ODbL (`reference <https://zenodo.org/records/14144752>`)
 - **Description:** Pre-built data of high-voltage transmission grid in Europe from OpenStreetMap.
 
 This dataset contains a topologically connected representation of the European

doc/data-retrieval.rst

@@ -9,6 +9,15 @@ Specific retrieval rules
 
 Data in this section is retrieved and extracted in rules specified in ``rules/retrieve.smk``.
 
+
+``data/fraunhofer_heat_source_utilisation_potentials``
+
+- **Source:** Fraunhofer Fordatis
+- **Link:** https://fordatis.fraunhofer.de/handle/fordatis/341.3?mode=simple
+- **License:** `CC BY 4.0 <https://creativecommons.org/licenses/by/4.0/>`__
+- **Description:** Utilisation potentials for different heat sources across Europe, based on Manz et al. 2024<https://doi.org/10.1016/j.renene.2024.120111>.
+
+
 ``data/nuts``
 
 - **Source:** GISCO

doc/release_notes.rst

@@ -11,6 +11,8 @@ Release Notes
 Upcoming Release
 ================
 
+* Feature: Introduce geothermal district heating (direct utilisation and heat pumps). Potentials are based on `Manz et al. 2024: Spatial analysis of renewable and excess heat potentials for climate-neutral district heating in Europe <https://www.sciencedirect.com/science/article/pii/S0960148124001769>`.
+
 * Feature: Allow CHPs to use different fuel sources such as gas, oil, coal, and methanol. Note that the cost assumptions are based on a gas CHP (except for solid biomass-fired CHP).
 
 * Improve `sanitize_carrier`` function by filling in colors of missing carriers with colors mapped after using the function `rename_techs`.
@@ -101,10 +103,12 @@ Upcoming Release
   - Single transformers for each combination of voltage level per substation. Transformers now have a capacity s_nom based on connected lines
   - Use of OSM relations where available and unambiguous (Overwriting all lines that are members of the respective relation to avoid duplicates)
 
-* Updated osm-prebuilt base network to version 0.5, for changelog, see https://zenodo.org/records/13981528
+* Updated osm-prebuilt base network to version 0.6, for changelog, see https://zenodo.org/records/14144752
 
 * Bugfix: vehicle-to-grid dispatch capacity is now limited by the fraction of vehicles participating in demand-side-management, halving the dispatch capacity under the default demand-side management participation rate of 0.5.
 
+* Bugfix: Align the naming convention for the CO2 network configuration (from `co2network` to `co2_network`). This may be a small breaking change.
+
 
 PyPSA-Eur 0.13.0 (13th September 2024)
 ======================================

envs/environment.yaml

@@ -21,7 +21,7 @@ dependencies:
 - xlrd
 - openpyxl
 - seaborn
-- snakemake-minimal>=8.14
+- snakemake-minimal<8.25 # See https://github.com/snakemake/snakemake/issues/3202
 - memory_profiler
 - yaml
 - pytables

envs/linux-pinned.yaml

@@ -30,10 +30,10 @@ dependencies:
 - aws-c-http=0.9.1
 - aws-c-io=0.15.2
 - aws-c-mqtt=0.11.0
-- aws-c-s3=0.7.1
+- aws-c-s3=0.7.2
 - aws-c-sdkutils=0.2.1
 - aws-checksums=0.2.2
-- aws-crt-cpp=0.29.5
+- aws-crt-cpp=0.29.6
 - aws-sdk-cpp=1.11.449
 - azure-core-cpp=1.14.0
 - azure-identity-cpp=1.10.0
@@ -50,13 +50,12 @@ dependencies:
 - brotli-python=1.1.0
 - bzip2=1.0.8
 - c-ares=1.34.3
-- c-blosc2=2.15.1
+- c-blosc2=2.15.2
 - ca-certificates=2024.8.30
-- cads-api-client=1.5.4
 - cairo=1.18.0
 - capnproto=1.0.2
 - cartopy=0.24.0
-- cdsapi=0.7.4
+- cdsapi=0.7.5
 - certifi=2024.8.30
 - cffi=1.17.1
 - cfgv=3.3.1
@@ -86,6 +85,7 @@ dependencies:
 - dask=2024.11.2
 - dask-core=2024.11.2
 - dask-expr=1.1.19
+- datapi=0.1.1
 - datrie=0.8.2
 - dav1d=1.2.1
 - dbus=1.13.6
@@ -147,7 +147,7 @@ dependencies:
 - humanfriendly=10.0
 - hyperframe=6.0.1
 - icu=75.1
-- identify=2.6.2
+- identify=2.6.3
 - idna=3.10
 - immutables=0.21
 - importlib-metadata=8.5.0
@@ -172,11 +172,11 @@ dependencies:
 - lerc=4.0.0
 - libabseil=20240722.0
 - libaec=1.1.3
-- libarchive=3.7.4
-- libarrow=18.0.0
-- libarrow-acero=18.0.0
-- libarrow-dataset=18.0.0
-- libarrow-substrait=18.0.0
+- libarchive=3.7.7
+- libarrow=18.1.0
+- libarrow-acero=18.1.0
+- libarrow-dataset=18.1.0
+- libarrow-substrait=18.1.0
 - libavif16=1.1.1
 - libblas=3.9.0
 - libbrotlicommon=1.1.0
@@ -239,7 +239,7 @@ dependencies:
 - libntlm=1.4
 - libopenblas=0.3.28
 - libopengl=1.7.0
-- libparquet=18.0.0
+- libparquet=18.1.0
 - libpciaccess=0.18
 - libpng=1.6.44
 - libpq=17.2
@@ -296,10 +296,10 @@ dependencies:
 - nomkl=1.0
 - nspr=4.36
 - nss=3.107
-- numexpr=2.10.1
+- numexpr=2.10.2
 - numpy=1.26.4
 - openjpeg=2.5.2
-- openldap=2.6.8
+- openldap=2.6.9
 - openpyxl=3.1.5
 - openssl=3.4.0
 - orc=2.0.3
@@ -319,7 +319,7 @@ dependencies:
 - plac=1.4.3
 - platformdirs=4.3.6
 - pluggy=1.5.0
-- polars=1.14.0
+- polars=1.15.0
 - poppler=24.08.0
 - poppler-data=0.4.12
 - postgresql=17.2
@@ -334,15 +334,15 @@ dependencies:
 - pulp=2.8.0
 - pure_eval=0.2.3
 - py-cpuinfo=9.0.0
-- pyarrow=18.0.0
-- pyarrow-core=18.0.0
+- pyarrow=18.1.0
+- pyarrow-core=18.1.0
 - pycountry=24.6.1
 - pycparser=2.22
 - pygments=2.18.0
 - pyogrio=0.10.0
 - pyparsing=3.2.0
 - pyproj=3.7.0
-- pypsa=0.31.1
+- pypsa=0.31.2
 - pyscipopt=5.2.1
 - pyshp=2.3.1
 - pyside6=6.8.0.2
@@ -351,9 +351,9 @@ dependencies:
 - pytest=8.3.3
 - python=3.12.7
 - python-dateutil=2.9.0.post0
-- python-fastjsonschema=2.20.0
+- python-fastjsonschema=2.21.0
 - python-tzdata=2024.2
-- python-utils=3.9.0
+- python-utils=3.9.1
 - python_abi=3.12
 - pytz=2024.1
 - pyxlsb=1.0.10
@@ -384,7 +384,7 @@ dependencies:
 - snakemake-interface-executor-plugins=9.3.2
 - snakemake-interface-report-plugins=1.1.0
 - snakemake-interface-storage-plugins=3.3.0
-- snakemake-minimal=8.25.3
+- snakemake-minimal=8.24.1
 - snappy=1.2.1
 - snuggs=1.4.7
 - sortedcontainers=2.4.0
@@ -403,8 +403,8 @@ dependencies:
 - tk=8.6.13
 - tomli=2.1.0
 - toolz=1.0.0
-- tornado=6.4.1
-- tqdm=4.67.0
+- tornado=6.4.2
+- tqdm=4.67.1
 - traitlets=5.14.3
 - typing-extensions=4.12.2
 - typing_extensions=4.12.2
@@ -417,13 +417,13 @@ dependencies:
 - uriparser=0.9.8
 - urllib3=2.2.3
 - validators=0.34.0
-- virtualenv=20.27.1
+- virtualenv=20.28.0
 - wayland=1.23.1
 - wcwidth=0.2.13
 - wheel=0.45.1
-- wrapt=1.16.0
+- wrapt=1.17.0
 - x265=3.5
-- xarray=2024.10.0
+- xarray=2024.11.0
 - xcb-util=0.4.1
 - xcb-util-cursor=0.1.5
 - xcb-util-image=0.4.0