PyPSA
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎Snakefile‎
Lines changed: 74 additions & 0 deletions b/‎Snakefile‎
Lines changed: 74 additions & 0 deletions
diff --git a/‎config/config.default.yaml‎
Lines changed: 5 additions & 1 deletion b/‎config/config.default.yaml‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎config/plotting.default.yaml‎
Lines changed: 7 additions & 0 deletions b/‎config/plotting.default.yaml‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎config/test/config.myopic.yaml‎
Lines changed: 14 additions & 9 deletions b/‎config/test/config.myopic.yaml‎
Lines changed: 14 additions & 9 deletions
diff --git a/‎config/test/config.overnight.yaml‎
Lines changed: 14 additions & 10 deletions b/‎config/test/config.overnight.yaml‎
Lines changed: 14 additions & 10 deletions
diff --git a/‎config/test/config.perfect.yaml‎
Lines changed: 13 additions & 10 deletions b/‎config/test/config.perfect.yaml‎
Lines changed: 13 additions & 10 deletions
diff --git a/‎doc/configtables/plotting.csv‎
Lines changed: 5 additions & 0 deletions b/‎doc/configtables/plotting.csv‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎doc/configtables/sector.csv‎
Lines changed: 9 additions & 5 deletions b/‎doc/configtables/sector.csv‎
Lines changed: 9 additions & 5 deletions
diff --git a/‎doc/data-bundle.rst‎
Lines changed: 8 additions & 1 deletion b/‎doc/data-bundle.rst‎
Lines changed: 8 additions & 1 deletion
@@ -79,4 +79,5 @@ dev/*
 # ai coding tools
 CLAUDE.md
 .claude/
-.github/copilot-instructions.md
+.github/copilot-instructions.md
+CLAUDE.local.md
@@ -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
 
 
 
@@ -533,7 +533,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
@@ -549,10 +548,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
 
@@ -4,6 +4,7 @@
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#plotting
 plotting:
+  enable_heat_source_maps: false
   map:
     boundaries: [-11, 30, 34, 71]
     geomap_colors:
@@ -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'
 
@@ -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
@@ -68,15 +68,17 @@ sector:
         booster_heat_pump: true
     ates:
       enable: 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:
@@ -92,7 +94,6 @@ sector:
   biomass_to_liquid: false
   electrobiofuels: false
 
-
 industry:
   HVC_environment_sequestration_fraction: 0.5
   waste_to_energy: true
@@ -119,3 +120,6 @@ plotting:
   energy_max:
   energy_min:
   energy_threshold: 0.000001
+  interactive_bus_balance:
+    bus_name_pattern: "*central heat*"
+  enable_heat_source_maps: true
@@ -51,16 +51,19 @@ sector:
         booster_heat_pump: true
     ates:
       enable: true
-    heat_pump_sources:
-      urban central:
-      - air
-      - geothermal
-      urban decentral:
-      - air
-      rural:
-      - air
-      - ground
-    hydrogen_turbine: false
+  heat_pump_sources:
+    urban central:
+    - air
+    - ptes
+    - river_water
+    - sea_water
+    - geothermal
+    urban decentral:
+    - air
+    rural:
+    - air
+    - ground
+  hydrogen_turbine: false
   regional_oil_demand: false
   regional_co2_sequestration_potential:
     enable: false
 
@@ -1,9 +1,14 @@
 ,Unit,Values,Description
+heat_sources,,,
+-- enable_heat_source_maps,--,bool,If true generate temporal aggregate maps for heat sources
 map,,,
 -- boundaries,°,"[x1,x2,y1,y2]",Boundaries of the map plots in degrees latitude (y) and longitude (x)
 -- geomap_colors,,,
 -- -- ocean,--,str,Color of the ocean in the geomap.
 -- -- land,--,str,Color of the land in the geomap.
+interactive_bus_balance,,,
+-- bus_name_pattern,--,str,Regex pattern to match bus names for which interactive balance time series are plotted. E.g. 'DE*' for all buses starting with 'DE'.
+
 projection,,,
 -- name,--,Valid Cartopy projection name,See https://scitools.org.uk/cartopy/docs/latest/reference/projections.html for list of available projections.
 -- args,--,--,"Other entries under 'projection' are passed as keyword arguments to the projection constructor, e.g. ``central_longitude: 10.``."
 
@@ -48,17 +48,21 @@ district_heating,--,,
 -- -- 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.
 -- -- min_delta_t_lift,--,float,"Minimum feasible temperature lift for heat pumps, used to approximate technical limits in heat pump operation. This value accounts for practical constraints in heat pump design."
--- 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``,
+-- -- min_delta_t_lift,--,float,"Minimum feasible temperature lift for heat pumps, used to approximate technical limits in heat pump operation. This value accounts for practical constraints in heat pump design."
+-- limited_heat_sources,--,,Dictionary with names of limited heat sources (not air). Must be `river_water` / `geothermal` or another heat source in `Manz et al. 2024 <https://www.sciencedirect.com/science/article/pii/S0960148124001769>`__)
+
+-- -- river_water,-,Name of the heat source. Must be the same as in ``heat_pump_sources``,
 -- -- -- constant_temperature_celsius,°C,heat source temperature,
 -- -- -- ignore_missing_regions,--,Boolean,Ignore missing regions in the data and fill with zeros or raise an error 
 -- 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``),
 -- temperature_limited_stores,,Dictionary with names for stores used as limited heat sources
 -- -- ptes,-,Name of the heat source. Must be the same as in ``heat_pump_sources``
+-- dh_area_buffer,m,float,The buffer by which dh_area shapes from Manz et al. are increased
 -- 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,
--- -- rural,--,List of heat sources for heat pumps in rural heating,
+-- -- urban central,--,"List of heat sources for heat pumps in urban central heating. Must be one of [air, river_water, sea_water, geothermal]",
+-- -- urban decentral,--,"List of heat sources for heat pumps in urban decentral heating. Must be one of [air]",
+-- -- rural,--,"List of heat sources for heat pumps in rural heating. Must be one of [air, ground]",
+
 cluster_heat_buses,--,"{true, false}",Cluster residential and service heat buses in `prepare_sector_network.py <https://github.com/PyPSA/pypsa-eur-sec/blob/master/scripts/prepare_sector_network.py>`_  to one to save memory.
 bev_dsm_restriction _value,--,float,Adds a lower state of charge (SOC) limit for battery electric vehicles (BEV) to manage its own energy demand (DSM). Located in `build_transport_demand.py <https://github.com/PyPSA/pypsa-eur-sec/blob/master/scripts/build_transport_demand.py>`_. Set to 0 for no restriction on BEV DSM
 bev_dsm_restriction _time,--,float,Time at which SOC of BEV has to be dsm_restriction_value
 
@@ -11,7 +11,14 @@ Data in this section is downloaded and extracted from the Zenodo data bundle
 large to be placed directly in the repository, have been reduced in spatial
 scope to reduce file size, or are not provided through stable URLs elsewhere.
 
-``data/bundle/je-e-21.03.02.xls``
+``data/bundle/seawater_temperature.nc``
+
+- **Source:** Copernicus Marine Environment Monitoring Service; https://doi.org/10.48670/moi-00021
+- **Link:** https://data.marine.copernicus.eu/product/GLOBAL_MULTIYEAR_PHY_001_030/description
+- **License:** `custom <https://marine.copernicus.eu/user-corner/service-commitments-and-licence>`__
+- **Description:** Seawater temperatures resolved in time and space for Europe. Copyright notice: All studies using this data have been conducted using E.U. Copernicus Marine Service Information (DOI: https://doi.org/10.48670/moi-00021) and related derivate work has been generated using E.U. Copernicus Marine Service Information (DOI: https://doi.org/10.48670/moi-00021).
+
+``data/bundle/je-e-21.03.02.nc``
 
 - **Source:** Swiss Federal Statistics Office
 - **Link:** https://www.bfs.admin.ch/bfs/en/home/news/whats-new.assetdetail.7786557.html#context-sidebar