Merge branch 'master' into energy-atlas-demand

Author: fneum

.github/workflows/codeql.yaml

@@ -59,7 +59,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -87,6 +87,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/test.yaml

@@ -106,7 +106,7 @@ jobs:
 
     - name: Upload artifacts
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: results-${{ matrix.os }}
         path: |

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

@@ -60,7 +60,7 @@ jobs:
 
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: lockfiles
         path: envs/*.lock.yaml
@@ -71,7 +71,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Download all artifacts
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: lockfiles
         path: envs/

.gitignore

@@ -79,4 +79,5 @@ dev/*
 # ai coding tools
 CLAUDE.md
 .claude/
-.github/copilot-instructions.md
+.github/copilot-instructions.md
+CLAUDE.local.md

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ ci:
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id: check-merge-conflict
   - id: check-added-large-files
@@ -17,7 +17,7 @@ repos:
 # Run ruff to lint and format
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.2
+  rev: v0.13.3
   hooks:
     # Run the linter.
   - id: ruff
@@ -47,17 +47,17 @@ repos:
   rev: v2.15.0
   hooks:
   - id: pretty-format-yaml
-    exclude: (pinned\.yaml|\.lock\.yaml)$
+    exclude: (\.lock\.yaml)$
     args: [--autofix, --indent, "2", --preserve-quotes]
 
   # Format Snakemake rule / workflow files
 - repo: https://github.com/snakemake/snakefmt
-  rev: v0.11.0
+  rev: v0.11.2
   hooks:
   - id: snakefmt
 
   # Check for FSFE REUSE compliance (licensing)
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v5.0.2
+  rev: v6.0.0
   hooks:
-  - id: reuse
+  - id: reuse-lint-file

Makefile

@@ -81,7 +81,6 @@ test:
 	snakemake -call solve_elec_networks --configfile config/test/config.electricity.yaml
 	snakemake -call --configfile config/test/config.overnight.yaml
 	snakemake -call --configfile config/test/config.myopic.yaml
-	snakemake -call make_summary_perfect --configfile config/test/config.perfect.yaml
 	snakemake -call resources/test-elec-clusters/networks/base_s_adm.nc --configfile config/test/config.clusters.yaml
 	snakemake -call --configfile config/test/config.scenarios.yaml -n
 	snakemake -call plot_power_networks_clustered --configfile config/test/config.tyndp.yaml

Snakefile

@@ -94,6 +94,12 @@ rule all:
             run=config["run"]["name"],
             **config["scenario"],
         ),
+        # COP profiles plots
+        expand(
+            RESULTS + "graphs/cop_profiles_s_{clusters}_{planning_horizons}.html",
+            run=config["run"]["name"],
+            **config["scenario"],
+        ),
         lambda w: expand(
             (
                 RESULTS
@@ -143,6 +149,74 @@ rule all:
             run=config["run"]["name"],
             **config["scenario"],
         ),
+        # Explicitly list heat source types for temperature maps
+        lambda w: expand(
+            (
+                RESULTS
+                + "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_river_water.html"
+                if config_provider("plotting", "enable_heat_source_maps")(w)
+                and "river_water"
+                in config_provider("sector", "heat_pump_sources", "urban central")(w)
+                else []
+            ),
+            **config["scenario"],
+            run=config["run"]["name"],
+        ),
+        lambda w: expand(
+            (
+                RESULTS
+                + "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_sea_water.html"
+                if config_provider("plotting", "enable_heat_source_maps")(w)
+                and "sea_water"
+                in config_provider("sector", "heat_pump_sources", "urban central")(w)
+                else []
+            ),
+            **config["scenario"],
+            run=config["run"]["name"],
+        ),
+        lambda w: expand(
+            (
+                RESULTS
+                + "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_ambient_air.html"
+                if config_provider("plotting", "enable_heat_source_maps")(w)
+                and "air"
+                in config_provider("sector", "heat_pump_sources", "urban central")(w)
+                else []
+            ),
+            **config["scenario"],
+            run=config["run"]["name"],
+        ),
+        # Only river_water has energy maps
+        lambda w: expand(
+            (
+                RESULTS
+                + "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_energy_map_river_water.html"
+                if config_provider("plotting", "enable_heat_source_maps")(w)
+                and "river_water"
+                in config_provider("sector", "heat_pump_sources", "urban central")(w)
+                else []
+            ),
+            **config["scenario"],
+            run=config["run"]["name"],
+        ),
+        expand(
+            RESULTS
+            + "graphics/balance_timeseries/s_{clusters}_{opts}_{sector_opts}_{planning_horizons}",
+            run=config["run"]["name"],
+            **config["scenario"],
+        ),
+        expand(
+            RESULTS
+            + "graphics/heatmap_timeseries/s_{clusters}_{opts}_{sector_opts}_{planning_horizons}",
+            run=config["run"]["name"],
+            **config["scenario"],
+        ),
+        expand(
+            RESULTS
+            + "graphics/interactive_bus_balance/s_{clusters}_{opts}_{sector_opts}_{planning_horizons}",
+            run=config["run"]["name"],
+            **config["scenario"],
+        ),
     default_target: True
 
 

config/config.default.yaml

@@ -534,7 +534,6 @@ sector:
       aquifer_volumetric_heat_capacity: 2600
       fraction_of_aquifer_area_available: 0.2
       effective_screen_length: 20
-      dh_area_buffer: 1000
       capex_as_fraction_of_geothermal_heat_source: 0.75
       recovery_factor: 0.6
       marginal_cost_charger: 0.035
@@ -550,10 +549,15 @@ sector:
       geothermal:
         constant_temperature_celsius: 65
         ignore_missing_regions: false
+      river_water:
+        constant_temperature_celsius: false
     direct_utilisation_heat_sources:
     - geothermal
     temperature_limited_stores:
     - ptes
+    dh_areas:
+      buffer: 1000
+      handle_missing_countries: fill
   heat_pump_sources:
     urban central:
     - air
@@ -736,6 +740,7 @@ sector:
     biomass_to_methanol: true
     biomass_to_methanol_cc: false
   ammonia: true
+  min_part_load_electrolysis: 0
   min_part_load_fischer_tropsch: 0.5
   min_part_load_methanolisation: 0.3
   min_part_load_methanation: 0.3

config/plotting.default.yaml

@@ -4,9 +4,10 @@
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#plotting
 plotting:
+  enable_heat_source_maps: false
   map:
     boundaries: [-11, 30, 34, 71]
-    color_geomap:
+    geomap_colors:
       ocean: white
       land: white
   projection:
@@ -53,6 +54,8 @@ plotting:
       - residential rural heat
       - services urban decentral heat
       - services rural heat
+  interactive_bus_balance:
+    bus_name_pattern: None
   heatmap_timeseries:
     marginal_price:
     - AC
@@ -458,6 +461,10 @@ plotting:
     urban central geothermal heat pump: '#4f2144'
     geothermal heat pump: '#4f2144'
     geothermal heat direct utilisation: '#ba91b1'
+    river_water heat: '#4bb9f2'
+    river_water heat pump: '#4bb9f2'
+    sea_water heat: '#0b222e'
+    sea_water heat pump: '#0b222e'
     ground heat pump: '#2fb537'
     residential rural ground heat pump: '#4f2144'
     residential rural air heat pump: '#48f74f'

config/test/config.myopic.yaml

@@ -40,15 +40,17 @@ sector:
       supplemental_heating:
         enable: true
         booster_heat_pump: true
-    heat_pump_sources:
-      urban central:
-      - air
-      - geothermal
-      urban decentral:
-      - air
-      rural:
-      - air
-      - ground
+  heat_pump_sources:
+    urban central:
+    - air
+    - geothermal
+    - river_water
+    - sea_water
+    urban decentral:
+    - air
+    rural:
+    - air
+    - ground
   hydrogen_turbine: false
   regional_oil_demand: false
   regional_co2_sequestration_potential:
@@ -121,3 +123,6 @@ plotting:
   energy_max:
   energy_min:
   energy_threshold: 0.000001
+  interactive_bus_balance:
+    bus_name_pattern: "*central heat*"
+  enable_heat_source_maps: true