Skip to content

Non-sequestered HVC Waste Allocation According to Population#1625

Merged
lindnemi merged 10 commits intomasterfrom
pop_distribute_non_sequestered_HVC
Apr 25, 2025
Merged

Non-sequestered HVC Waste Allocation According to Population#1625
lindnemi merged 10 commits intomasterfrom
pop_distribute_non_sequestered_HVC

Conversation

@toniseibold
Copy link
Copy Markdown
Contributor

@toniseibold toniseibold commented Apr 2, 2025

Changes proposed in this Pull Request

This PR entangles the naphtha for industry links.
So far, these links included the production of HVC (and therefore meeting the load naphtha for industry) that is linked to process emissions as well as the waste handling of HVC at its end of life.
In this PR those two processes are separated to make the code easier to comprehend and distribute the emissions from HVC waste in a more logical sense:

  • a total of non-sequestered HVC waste volume is calculated
  • depending on the spatial resolution of the naphtha demand it is added as a European or bus region specific store
  • In case of bus region resolution the waste volume is distributed according to the population (underlying assumption: every European citizen contributes equally to the HVC waste volume without country specific differences)
  • The non-sequestered HVC must either be burned without energetic utilisation or can be used in waste CHPs (with or without CC)

Test
workflow runs locally with the different config settings

  • waste_to_energy: true/false
  • waste_to_energy_cc: true/false
  • regional_oil_demand: true/false

Results

  • total CO2 emissions from non-sequestered HVC (in case of waste_to_energy: false and waste_to_energy_cc: false: 60.43 Mt
  • total carbon content of naphtha for industry load: 71.18 Mt
  • remaining process emissions: 10.80 Mt from naphtha for industry links
    Store energy content
    image

Checklist

  • I tested my contribution locally and it works as intended.
  • Code and workflow changes are sufficiently documented.
  • Changed dependencies are added to envs/environment.yaml.
    not applicable
  • Changes in configuration options are added in config/config.default.yaml.
    not applicable
  • Changes in configuration options are documented in doc/configtables/*.csv.
    not applicable
  • Sources of newly added data are documented in doc/data_sources.rst.
    not applicable
  • A release note doc/release_notes.rst is added.

@toniseibold toniseibold requested a review from fneum April 2, 2025 09:44
@toniseibold toniseibold requested a review from lindnemi April 2, 2025 09:44
@toniseibold toniseibold marked this pull request as ready for review April 2, 2025 09:44
@fneum fneum requested a review from Copilot April 3, 2025 08:49
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR separates the handling of HVC waste from process emissions and distributes non-sequestered HVC waste based on population, improving code clarity and logical emissions allocation. Key changes include:

  • Separating HVC waste processing from process emissions and introducing distinct calculations for non-sequestered HVC.
  • Adding a store for population-distributed non-sequestered HVC and updating links to reflect the new distribution logic.
  • Updating plotting configuration with a new color for non-sequestered HVC.

Reviewed Changes

Copilot reviewed 2 out of 3 changed files in this pull request and generated no comments.

File Description
scripts/prepare_sector_network.py Separates HVC waste handling, adds store/link for population-based distribution, and updates efficiency parameters.
config/plotting.default.yaml Adds a color code for non-sequestered HVC to support visual differentiation.
Files not reviewed (1)
  • doc/release_notes.rst: Language not supported
Comments suppressed due to low confidence (2)

scripts/prepare_sector_network.py:4649

  • Replacing 'efficiency2' with 'efficiency' changes the parameter passed to the link; please confirm that this update is intentional and that it captures the intended scaling for CO2 intensity without omitting adjustments from non-sequestered or process emissions.
efficiency=costs.at["oil", "CO2 intensity"]

scripts/prepare_sector_network.py:4615

  • [nitpick] Appending the suffix directly to the index may lead to duplicated labels if the index already contains ' non-sequestered HVC'; consider verifying that the index values are consistently unique.
HVC_potential.index = HVC_potential.index + " non-sequestered HVC"

@lindnemi
Copy link
Copy Markdown
Contributor

lindnemi commented Apr 3, 2025

Great, PR! I would suggest to go two steps further:

Step 1 (could be done in this PR): Decouple non-sequestered HVC completely from the oil_demand and instead of using the non_sequestered_hvc_locations as buses, always use nodes as buses. Would simplify the code and intuitively makes more sense to me. What are your thoughts on this @toniseibold , @fneum ?

Step 2 (separate PR): Decouple the waste sector from the industry sector. With the decoupling of process emissions from naptha for industry, that should be relatively straightforward.

General remark: We might have to be a bit careful with potential double counting in "municipal solid waste" and "non-sequestered HVC"

@fneum fneum modified the milestone: v2025.04.0 Apr 5, 2025
@toniseibold
Copy link
Copy Markdown
Contributor Author

@lindnemi I moved the the locations of non-sequestered HVC to the spatial variable as suggested.

Copy link
Copy Markdown
Contributor

@lindnemi lindnemi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The location of the non-sequestered HVC is now much cleaner and follows the style of the other oil carriers more closely.

However, what I suggested, was to decouple the HVC waste entirely from the oil_sector, i.e., to always use full spatial resolution of HVC waste by assigning them to all nodes, regardless if options['regional_oil_demand'] is True or False.

Since there is going to be a second PR for decoupling the waste sector from the overall industry sector, I leave it up to you if you want to implement the decoupling from regional_oil_demand already here or in the follow up PR.

Otherwise the PR looks good (Caveat: I only looked at the code, but didn't run it, let me know if you need a second person to run it, i will have time tomorrow)

@toniseibold toniseibold force-pushed the pop_distribute_non_sequestered_HVC branch from a2e3ed2 to fbc523a Compare April 9, 2025 08:55
@lindnemi lindnemi merged commit bc6b7a6 into master Apr 25, 2025
8 of 10 checks passed
@lindnemi lindnemi deleted the pop_distribute_non_sequestered_HVC branch April 25, 2025 11:18
@fneum
Copy link
Copy Markdown
Member

fneum commented Apr 28, 2025

Hi @toniseibold, @lindnemi! It looks good, and it was okay to merge. I have two remarks that could be tackled in a follow-up PR, mostly related to model size:

  1. Instead of a Store, one could use a Generator with e_sum_min. This reduces the number of decision variables.

  2. Previously, there was the option to skip the model complications when waste-to-energy is deactivated (e.g., avoiding extra buses and stores for HVC). I think you should keep this option and move the creation of HVC buses and stores/generators into the waste-to-energy block.

n.add(
    "Link",
    spatial.oil.naphtha,
    bus0=spatial.oil.nodes,
    bus1=spatial.oil.naphtha,
    bus2="co2 atmosphere",
    bus3=spatial.co2.process_emissions,
    carrier="naphtha for industry",
    p_nom_extendable=True,
    efficiency2=emitted_co2_per_naphtha * non_sequestered,
    efficiency3=process_co2_per_naphtha,
)

amos-schledorn pushed a commit that referenced this pull request Apr 29, 2025
* non-sequestered HVC waste allocation according to population

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* adding release note and correcting link efficiencies

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* moving locations of non-sequestered hvc to 'spatial' variable

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Micha <[email protected]>
amos-schledorn added a commit that referenced this pull request Oct 24, 2025
* feat: add river-water and sea-water heat pumps

* remove obsolete modules

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: add copernicusmarine to envs

* feat: Add option to disable progress bar in seawater data retrieval script

* fix: Ensure temperature difference is non-negative in heat flow calculation

* fix: Impose cut-off temperature for sea water heat

* feat: Add temporal aggregation for river and sea water heat potential calculations as outputs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* chore: Add SPDX license identifiers to surface water heat potential scripts

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: Use no-verbose mode for wget when retrieving hera data

* fix: typos

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: update chunking parameters for river and ambient temperature datasets to surpress warnings

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* doc:: update data bundle docs to include Copernicus seawater temperature dataset with source and licensing information

* refactor: update seawater temperature data path to bundle, add file to bundle retrieval and remove unused retrieval script

* feat: update seawater data retrieval

* fix: import shapely correctly in sea_water_heat_approximator.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: streamline temporal aggregate merging

* feat: add heat source mapping functionality and ambient air temperature processing

* fix: correct region geometry buffering in SeaWaterHeatApproximator

* feat: enhance heat source map with aggregation options for temperature and energy

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: remove seawater temperature data file from databundle retrieval

* fix: update seawater temperature data source and improve region geometry handling

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: add rule and script for plotting coefficient of performance (COP) profiles of heat pumps

* fix: correct import paths for HeatSector and HeatSystemType in heat_system.py

* fix: update output paths for COP profiles to use 'graphs' directory

* feat: enhance COP data preparation to support multiple heat system types and improve plotting functionality

* refactor: streamline COP data preparation and enhance interactive plotting functionality

* feat: add region_dim parameter to prepare_cop_data function for enhanced flexibility

* fix: improve validation for regions_onshore and enhance aggregate_type handling in plot_heat_source_map function

* feat: add region_dim parameter to create_interactive_cop_plot function for improved region filtering

* feat: add rules for bus carrier dispatch and annual energy balance plots in Snakemake workflow

* refactor: update output paths for bus carrier dispatch plots and adjust memory resources in postprocess rules

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* use absolute imports (#1643)

* use absolute imports

* add release note

* fix typo

* Non-sequestered HVC Waste Allocation According to Population (#1625)

* non-sequestered HVC waste allocation according to population

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* adding release note and correcting link efficiencies

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* moving locations of non-sequestered hvc to 'spatial' variable

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Micha <[email protected]>

* fix: update fallback value for unusable water temperature from absolute zero to -1e9

* feat: enhance water heat potential models and improve data handling

- Added district heating area buffer configuration in config.default.yaml
- Updated plotting.default.yaml to include river and sea water heat sources
- Enhanced build_sector.smk to incorporate district heating area data
- Introduced retrieve_dh_areas rule in retrieve.smk for fetching district heating areas
- Refactored river_water_heat_approximator.py and sea_water_heat_approximator.py for improved data validation and processing
- Modified build_river_water_heat_potential.py and build_sea_water_heat_potential.py to handle district heating areas
- Improved plot_heat_source_map.py for better data filtering and error handling

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: correct unit in heat power calculation

* feat: clip COP bewlow 1 to 0

* refactor: simplify cop profile plotting

* refactor: streamline heat source retrieval and improve plot info

* refactor: simplify plot_bus_carrier_dispatch

* refactor: enhance plot_bus_carrier_dispatch with bus name pattern and output directory

* refactor: rename plot_bus_carrier_dispatch to plot_interactive_bus_balance and update output paths

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: reorder import statements for clarity

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: clean up whitespace in create_interactive_cop_plot function

* feat: remove sea-water by default but add heat pump sources sea-water and geothermal to myopic, overnight, and perfect test configuration files

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: update limited heat sources in sector.csv to include river_water and clarify data source requirements

* refactor: remove outdated reference to heat_demand in data-retrieval.rst

* doc: update release notes

* doc: add interactive bus plotting to docs and test config

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: simplify output directory structure for heatmap timeseries in rule all

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update scripts/build_cop_profiles/BaseCopApproximator.py

Co-authored-by: Copilot <[email protected]>

* Update scripts/build_ambient_air_temperature_yearly_average.py

Co-authored-by: Copilot <[email protected]>

* Update rules/build_sector.smk

Co-authored-by: Copilot <[email protected]>

* Update rules/build_sector.smk

Co-authored-by: Copilot <[email protected]>

* fix: correct formatting of limited_heat_sources description in sector.csv

* refactor: remove redundant comments and clean up coefficient of performance calculation

* fix: update input_heat_source_temperature function to include 'ptes' in replace_names and adjust resource references

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: update input_heat_source_temperature and related rules for ptes naming conventions and output formatting

* fix: add plotly dependency to environment.yaml and linux-pinned.yaml

* fix: update bus_name_pattern in plotting configuration to None

* fix: update bus_name_pattern in plotting configuration to None

* compress hera data after download

* use curl instead of wget and nccopy

* refactor: revert back to uncompressed wget

* bugfix: add existing renewables consistent with renewable_carriers list (#1717)

* feat: include existing capacities only for included renewable carriers

* bugfix: only add solar rooftop in distribution grid when solar included in config

* revert mock snakemake changes

* refactor: change to if not continue style to reduce diff

* Add offwind float to CCL (#1725)

* Fix: Invalid aquifer shapes in build_ates_potentials (#1724)

* fix: ensure aquifer geometries are valid in build_ates_potentials.py

* fix: add release note for fixing invalid aquifer shape geometries in build_ates_potentials.py

* feat: use bundle hera data for test cutout

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: pass heat_pump_cop_approximation configs correctly (#1729)

* fix: forward heat_pump_cop_approximation config to CentralHeatingCopApproximator

* refactor: set correct heat source for ptes boosting and include titel/link to source for min_delta_t_lift

---------

Co-authored-by: Amos Schledorn <[email protected]>

* Fix ``plot_hydrogen_network`` : storage + Added CCL explantions in the configtables (#1727)

* Add offwind float to CCL

* Update plot_hydrogen_network.py

Fix the code to plot the storage

* Update release_notes.rst

* Update solving.csv

Add precision for the CCL constraint (not working with a time resolution higher than 1h) + add indication on how to use agg_p_nom_limits

* fix: update method call to use 'cop()' instead of 'approximate_cop()' in get_cop function

* fix: remove unnecessary parentheses in cop() method call in get_cop function

* fix: update retrieve_hera_data rule to use config_provider for snapshot year in output paths

* fix: update retrieve_hera_data rule to use snapshot_year directly in output paths

* feat: introduce dh_area building and improve handling of missing dh_area countries

* update config

* doc: improve comments

* update gitignore

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat:improve performance

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix:p_max_pu and p_nom_max for geothermal heat source

* fix: update heat source handling in add_heat function

* fix: remove unused heat pump sources from configuration

* fix: add shipping sector and update zero cost settings for heat sources

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* doc:update release notes and docs

* fix: enable CO2 sequestration potential check in add_co2_tracking function

* refactor:  type hints and improved documentation

* refactor: enhance type hints and improve documentation in SurfaceWaterHeatApproximator

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update config

* feat: reintroduce default target for the 'all' rule

* refactor: update default parameters in RiverWaterHeatApproximator

* fix: correct snapshot retrieval method in retrieve.smk

* fix: improve handling of zero-cost heat sources in add_heat function

* fix: update mock_snakemake call to use correct script name for sea heat potential

* fix: correct default_target case in all rule and refactor snapshot_year assignment

* fix: ensure temporal aggregate is only deleted when generated in get_regional_result function

* fix: fix static config handling

* fix: update default min_outlet_temperature in RiverWaterHeatApproximator to 1C

* fix: update input parameters for build_river_heat_potential rule and correct mock_snakemake call

* feat: wrap heat_source_map output into input function

* fix: remove comment from generate_temporal_aggregates in plotting configuration

* Revert "feat: wrap heat_source_map output into input function"

This reverts commit e6306ca.

* fix: update heat source map configuration references in Snakefile and plotting defaults

* Update doc/configtables/sector.csv

Co-authored-by: Fabian Neumann <[email protected]>

* fix:only plot heat source maps for activated heat pump sources

* fix: correct description for enabling temporal aggregate maps for heat sources

* fix:activate interactive_bus_balance ("*central heat*") in test configs

* fix: improve warning message for missing heat source cost data

* fix: replace print statements with logger for missing countries handling

* fix: add bokeh and folium to environment dependencies

* fix: update heat source map configuration for river, sea, and ambient air sources

* fix: heat pump sources in test configs

* fix: update heat source map configuration to use 'air' instead of 'ambient_air'

* fix: update docstring formatting for RiverWaterHeatApproximator class

* fix: update URLs for river discharge and ambient temperature data to V2

* fix: simplify power calculation constants in SurfaceWaterHeatApproximator

* fix:cosmetic updates

* Update doc/configtables/plotting.csv

Co-authored-by: Fabian Neumann <[email protected]>

* Update doc/configtables/sector.csv

Co-authored-by: Fabian Neumann <[email protected]>

* fix: update interactive bus balance configuration in plotting.csv

* fix: update release notes

* fix: remove unused dynamic inputs for hera data retrieval

* fix: rename generate_temporal_aggregates to enable_heat_source_maps

* Update rules/retrieve.smk

Co-authored-by: Fabian Neumann <[email protected]>

* fix: update thread configuration for build_river_heat_potential rule

* fix: update HERA data retrieval URLs to version 1.0

* fix: improve readability of input_heat_source_temperature function

* fix:use move/storage + year wildcard in hera data retrieval

* fix: update pypsa version to 0.33.0 in environment.yaml

* fix: pypsa options usage

* fix: pin `pypsa>=0.34.0`

* Update locked environment files for all platforms (#1832)

Co-authored-by: lkstrp <[email protected]>

* feat: support multi-year snapshots

* fix:re-add ptes temperature to build_cop_profiles rule

* fix: update output filenames for ptes direct utilisation and temperature profiles

* fix: update output filename for ptes direct utilisation profiles to include 's_' prefix

* fix: correct indentation for hydrogen_turbine in sector configuration

* feat: automate seawater temperature retrieval for custom weather years

* refactor:simplify weather data handling through xr.open_mfdataset

* feat: add rule to retrieve seawater temperature for 2013 and improve error handling in retrieval script

* fix: update output file naming conventions in ptes operations

* feat: enhance documentation and type hints in data retrieval and plotting scripts

* fix: update output filename for ptes direct utilisation profiles to include 'base'

* feat: conditionally define seawater temperature retrieval rules based on default cutout configuration

* fix: rename seawater temperature retrieval rule for 2013

* fix: update seawater temperature output filename to reflect 2013 data

* fix: update seawater temperature output filename for test cutout

* fix: update seawater temperature data for test cutout

* fix: update seawater temperature file references to 2013 data

* fix: update seawater temperature references for test cutout

* fix: streamline seawater temperature retrieval for test cutout and enhance logging

* fix: remove benchmark logging for seawater temperature retrieval

* feat: rename build_cop_approximator submodules to snakecase

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Resolve merge conflicts

* refactor: update district heating area configuration and improve heat pump cost handling

* fix: update rule name in mock_snakemake for testing in build_dh_areas script

* refactor: remove unnecessary comment to avoid circular imports in input_hera_data function

* refactor: update docstring for RiverWaterHeatApproximator to clarify parameters

* refactor: clarify parameters in docstring for RiverWaterHeatApproximator

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <[email protected]>
Co-authored-by: Toni <[email protected]>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Micha <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Daniel Rüdt <[email protected]>
Co-authored-by: JuliaSvn <[email protected]>
Co-authored-by: TomKae00 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <[email protected]>
toniseibold added a commit that referenced this pull request Dec 1, 2025
* feat: add river-water and sea-water heat pumps

* remove obsolete modules

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: add copernicusmarine to envs

* feat: Add option to disable progress bar in seawater data retrieval script

* fix: Ensure temperature difference is non-negative in heat flow calculation

* fix: Impose cut-off temperature for sea water heat

* feat: Add temporal aggregation for river and sea water heat potential calculations as outputs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* chore: Add SPDX license identifiers to surface water heat potential scripts

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: Use no-verbose mode for wget when retrieving hera data

* fix: typos

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: update chunking parameters for river and ambient temperature datasets to surpress warnings

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* doc:: update data bundle docs to include Copernicus seawater temperature dataset with source and licensing information

* refactor: update seawater temperature data path to bundle, add file to bundle retrieval and remove unused retrieval script

* feat: update seawater data retrieval

* fix: import shapely correctly in sea_water_heat_approximator.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: streamline temporal aggregate merging

* feat: add heat source mapping functionality and ambient air temperature processing

* fix: correct region geometry buffering in SeaWaterHeatApproximator

* feat: enhance heat source map with aggregation options for temperature and energy

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: remove seawater temperature data file from databundle retrieval

* fix: update seawater temperature data source and improve region geometry handling

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: add rule and script for plotting coefficient of performance (COP) profiles of heat pumps

* fix: correct import paths for HeatSector and HeatSystemType in heat_system.py

* fix: update output paths for COP profiles to use 'graphs' directory

* feat: enhance COP data preparation to support multiple heat system types and improve plotting functionality

* refactor: streamline COP data preparation and enhance interactive plotting functionality

* feat: add region_dim parameter to prepare_cop_data function for enhanced flexibility

* fix: improve validation for regions_onshore and enhance aggregate_type handling in plot_heat_source_map function

* feat: add region_dim parameter to create_interactive_cop_plot function for improved region filtering

* feat: add rules for bus carrier dispatch and annual energy balance plots in Snakemake workflow

* refactor: update output paths for bus carrier dispatch plots and adjust memory resources in postprocess rules

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* use absolute imports (#1643)

* use absolute imports

* add release note

* fix typo

* Non-sequestered HVC Waste Allocation According to Population (#1625)

* non-sequestered HVC waste allocation according to population

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* adding release note and correcting link efficiencies

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* moving locations of non-sequestered hvc to 'spatial' variable

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Micha <[email protected]>

* fix: update fallback value for unusable water temperature from absolute zero to -1e9

* feat: enhance water heat potential models and improve data handling

- Added district heating area buffer configuration in config.default.yaml
- Updated plotting.default.yaml to include river and sea water heat sources
- Enhanced build_sector.smk to incorporate district heating area data
- Introduced retrieve_dh_areas rule in retrieve.smk for fetching district heating areas
- Refactored river_water_heat_approximator.py and sea_water_heat_approximator.py for improved data validation and processing
- Modified build_river_water_heat_potential.py and build_sea_water_heat_potential.py to handle district heating areas
- Improved plot_heat_source_map.py for better data filtering and error handling

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: correct unit in heat power calculation

* feat: clip COP bewlow 1 to 0

* refactor: simplify cop profile plotting

* refactor: streamline heat source retrieval and improve plot info

* refactor: simplify plot_bus_carrier_dispatch

* refactor: enhance plot_bus_carrier_dispatch with bus name pattern and output directory

* refactor: rename plot_bus_carrier_dispatch to plot_interactive_bus_balance and update output paths

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: reorder import statements for clarity

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: clean up whitespace in create_interactive_cop_plot function

* feat: remove sea-water by default but add heat pump sources sea-water and geothermal to myopic, overnight, and perfect test configuration files

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: update limited heat sources in sector.csv to include river_water and clarify data source requirements

* refactor: remove outdated reference to heat_demand in data-retrieval.rst

* doc: update release notes

* doc: add interactive bus plotting to docs and test config

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: simplify output directory structure for heatmap timeseries in rule all

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update scripts/build_cop_profiles/BaseCopApproximator.py

Co-authored-by: Copilot <[email protected]>

* Update scripts/build_ambient_air_temperature_yearly_average.py

Co-authored-by: Copilot <[email protected]>

* Update rules/build_sector.smk

Co-authored-by: Copilot <[email protected]>

* Update rules/build_sector.smk

Co-authored-by: Copilot <[email protected]>

* fix: correct formatting of limited_heat_sources description in sector.csv

* refactor: remove redundant comments and clean up coefficient of performance calculation

* fix: update input_heat_source_temperature function to include 'ptes' in replace_names and adjust resource references

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: update input_heat_source_temperature and related rules for ptes naming conventions and output formatting

* fix: add plotly dependency to environment.yaml and linux-pinned.yaml

* fix: update bus_name_pattern in plotting configuration to None

* fix: update bus_name_pattern in plotting configuration to None

* compress hera data after download

* use curl instead of wget and nccopy

* refactor: revert back to uncompressed wget

* bugfix: add existing renewables consistent with renewable_carriers list (#1717)

* feat: include existing capacities only for included renewable carriers

* bugfix: only add solar rooftop in distribution grid when solar included in config

* revert mock snakemake changes

* refactor: change to if not continue style to reduce diff

* Add offwind float to CCL (#1725)

* Fix: Invalid aquifer shapes in build_ates_potentials (#1724)

* fix: ensure aquifer geometries are valid in build_ates_potentials.py

* fix: add release note for fixing invalid aquifer shape geometries in build_ates_potentials.py

* feat: use bundle hera data for test cutout

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: pass heat_pump_cop_approximation configs correctly (#1729)

* fix: forward heat_pump_cop_approximation config to CentralHeatingCopApproximator

* refactor: set correct heat source for ptes boosting and include titel/link to source for min_delta_t_lift

---------

Co-authored-by: Amos Schledorn <[email protected]>

* Fix ``plot_hydrogen_network`` : storage + Added CCL explantions in the configtables (#1727)

* Add offwind float to CCL

* Update plot_hydrogen_network.py

Fix the code to plot the storage

* Update release_notes.rst

* Update solving.csv

Add precision for the CCL constraint (not working with a time resolution higher than 1h) + add indication on how to use agg_p_nom_limits

* fix: update method call to use 'cop()' instead of 'approximate_cop()' in get_cop function

* fix: remove unnecessary parentheses in cop() method call in get_cop function

* fix: update retrieve_hera_data rule to use config_provider for snapshot year in output paths

* fix: update retrieve_hera_data rule to use snapshot_year directly in output paths

* feat: introduce dh_area building and improve handling of missing dh_area countries

* update config

* doc: improve comments

* update gitignore

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat:improve performance

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix:p_max_pu and p_nom_max for geothermal heat source

* fix: update heat source handling in add_heat function

* fix: remove unused heat pump sources from configuration

* fix: add shipping sector and update zero cost settings for heat sources

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* doc:update release notes and docs

* fix: enable CO2 sequestration potential check in add_co2_tracking function

* refactor:  type hints and improved documentation

* refactor: enhance type hints and improve documentation in SurfaceWaterHeatApproximator

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update config

* feat: reintroduce default target for the 'all' rule

* refactor: update default parameters in RiverWaterHeatApproximator

* fix: correct snapshot retrieval method in retrieve.smk

* fix: improve handling of zero-cost heat sources in add_heat function

* fix: update mock_snakemake call to use correct script name for sea heat potential

* fix: correct default_target case in all rule and refactor snapshot_year assignment

* fix: ensure temporal aggregate is only deleted when generated in get_regional_result function

* fix: fix static config handling

* fix: update default min_outlet_temperature in RiverWaterHeatApproximator to 1C

* fix: update input parameters for build_river_heat_potential rule and correct mock_snakemake call

* feat: wrap heat_source_map output into input function

* fix: remove comment from generate_temporal_aggregates in plotting configuration

* Revert "feat: wrap heat_source_map output into input function"

This reverts commit e6306ca.

* fix: update heat source map configuration references in Snakefile and plotting defaults

* Update doc/configtables/sector.csv

Co-authored-by: Fabian Neumann <[email protected]>

* fix:only plot heat source maps for activated heat pump sources

* fix: correct description for enabling temporal aggregate maps for heat sources

* fix:activate interactive_bus_balance ("*central heat*") in test configs

* fix: improve warning message for missing heat source cost data

* fix: replace print statements with logger for missing countries handling

* fix: add bokeh and folium to environment dependencies

* fix: update heat source map configuration for river, sea, and ambient air sources

* fix: heat pump sources in test configs

* fix: update heat source map configuration to use 'air' instead of 'ambient_air'

* fix: update docstring formatting for RiverWaterHeatApproximator class

* fix: update URLs for river discharge and ambient temperature data to V2

* fix: simplify power calculation constants in SurfaceWaterHeatApproximator

* fix:cosmetic updates

* Update doc/configtables/plotting.csv

Co-authored-by: Fabian Neumann <[email protected]>

* Update doc/configtables/sector.csv

Co-authored-by: Fabian Neumann <[email protected]>

* fix: update interactive bus balance configuration in plotting.csv

* fix: update release notes

* fix: remove unused dynamic inputs for hera data retrieval

* fix: rename generate_temporal_aggregates to enable_heat_source_maps

* Update rules/retrieve.smk

Co-authored-by: Fabian Neumann <[email protected]>

* fix: update thread configuration for build_river_heat_potential rule

* fix: update HERA data retrieval URLs to version 1.0

* fix: improve readability of input_heat_source_temperature function

* fix:use move/storage + year wildcard in hera data retrieval

* fix: update pypsa version to 0.33.0 in environment.yaml

* fix: pypsa options usage

* fix: pin `pypsa>=0.34.0`

* Update locked environment files for all platforms (#1832)

Co-authored-by: lkstrp <[email protected]>

* feat: support multi-year snapshots

* fix:re-add ptes temperature to build_cop_profiles rule

* fix: update output filenames for ptes direct utilisation and temperature profiles

* fix: update output filename for ptes direct utilisation profiles to include 's_' prefix

* fix: correct indentation for hydrogen_turbine in sector configuration

* feat: automate seawater temperature retrieval for custom weather years

* refactor:simplify weather data handling through xr.open_mfdataset

* feat: add rule to retrieve seawater temperature for 2013 and improve error handling in retrieval script

* fix: update output file naming conventions in ptes operations

* feat: enhance documentation and type hints in data retrieval and plotting scripts

* fix: update output filename for ptes direct utilisation profiles to include 'base'

* feat: conditionally define seawater temperature retrieval rules based on default cutout configuration

* fix: rename seawater temperature retrieval rule for 2013

* fix: update seawater temperature output filename to reflect 2013 data

* fix: update seawater temperature output filename for test cutout

* fix: update seawater temperature data for test cutout

* fix: update seawater temperature file references to 2013 data

* fix: update seawater temperature references for test cutout

* fix: streamline seawater temperature retrieval for test cutout and enhance logging

* fix: remove benchmark logging for seawater temperature retrieval

* feat: rename build_cop_approximator submodules to snakecase

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Resolve merge conflicts

* refactor: update district heating area configuration and improve heat pump cost handling

* fix: update rule name in mock_snakemake for testing in build_dh_areas script

* refactor: remove unnecessary comment to avoid circular imports in input_hera_data function

* refactor: update docstring for RiverWaterHeatApproximator to clarify parameters

* refactor: clarify parameters in docstring for RiverWaterHeatApproximator

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <[email protected]>
Co-authored-by: Toni <[email protected]>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Micha <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Daniel Rüdt <[email protected]>
Co-authored-by: JuliaSvn <[email protected]>
Co-authored-by: TomKae00 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <[email protected]>
martacki pushed a commit to open-energy-transition/Ember-Flexibility-Study that referenced this pull request Dec 3, 2025
* Update locked environment files for all platforms (PyPSA#1832)

Co-authored-by: lkstrp <[email protected]>

* remove pinned environment reference from pre-commit-config (PyPSA#1837)

* remove pinned environment reference from pre-commit-config

* release notes

* refactor: use single-line comment for rst (PyPSA#1839)

* Check for leaked secrets using pre-commit (#59)

* Update the other pre-commit tasks

* Revert pre-commit versions

* doc: clean headers (#51)

* doc: clean headers

* doc: improve PR template

* Apply suggestions from code review

Co-authored-by: Johannes HAMPP <[email protected]>

* refactor: adjust header for new page

* fix: adjust header for OETC

---------

Co-authored-by: Johannes HAMPP <[email protected]>

* Fix JRC ARDECO API change. (PyPSA#1850)

* Add gitleaks config to ignore lockfiles

* chore(deps): bump github/codeql-action in the github-actions group (PyPSA#1851)

Bumps the github-actions group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3 to 4
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v3...v4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <[email protected]>

* [pre-commit.ci] pre-commit autoupdate (PyPSA#1848)

updates:
- [github.com/pre-commit/pre-commit-hooks: v5.0.0 → v6.0.0](pre-commit/pre-commit-hooks@v5.0.0...v6.0.0)
- [github.com/astral-sh/ruff-pre-commit: v0.12.2 → v0.13.3](astral-sh/ruff-pre-commit@v0.12.2...v0.13.3)
- [github.com/snakemake/snakefmt: v0.11.0 → v0.11.2](snakemake/snakefmt@v0.11.0...v0.11.2)
- [github.com/fsfe/reuse-tool: v5.0.2 → v6.0.0](fsfe/reuse-tool@v5.0.2...v6.0.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <[email protected]>

* Update minimum pypsa version to 0.33.2 (PyPSA#1849)

* Update minimum pypsa version to 0.35.2

* doc: Update release notes

* Update envs/environment.yaml

* Update doc/release_notes.rst

---------

Co-authored-by: Lukas Trippe <[email protected]>

* Update locked environment files for all platforms (PyPSA#1843)

Co-authored-by: lkstrp <[email protected]>

* test: remove perfect foresight and mark as not stable (PyPSA#1853)

* refactor: another PyPSA v1 deprecation (PyPSA#1858)

* refactor: another PyPSA v1 deprecation

* `0.35.2` compatibility

* Update pre-commit hook to reuse-lint-file (PyPSA#1862)

* fix: add retrys for zenodo requests with tenacity (PyPSA#1861)

* [github-actions.ci] Update locked envs

Co-authored-by: lkstrp <[email protected]>

* Add gitleaks config to ignore lockfiles (#63)

* feat: add river-water and sea-water sourced heat pumps (PyPSA#1618)

* feat: add river-water and sea-water heat pumps

* remove obsolete modules

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: add copernicusmarine to envs

* feat: Add option to disable progress bar in seawater data retrieval script

* fix: Ensure temperature difference is non-negative in heat flow calculation

* fix: Impose cut-off temperature for sea water heat

* feat: Add temporal aggregation for river and sea water heat potential calculations as outputs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* chore: Add SPDX license identifiers to surface water heat potential scripts

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: Use no-verbose mode for wget when retrieving hera data

* fix: typos

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: update chunking parameters for river and ambient temperature datasets to surpress warnings

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* doc:: update data bundle docs to include Copernicus seawater temperature dataset with source and licensing information

* refactor: update seawater temperature data path to bundle, add file to bundle retrieval and remove unused retrieval script

* feat: update seawater data retrieval

* fix: import shapely correctly in sea_water_heat_approximator.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: streamline temporal aggregate merging

* feat: add heat source mapping functionality and ambient air temperature processing

* fix: correct region geometry buffering in SeaWaterHeatApproximator

* feat: enhance heat source map with aggregation options for temperature and energy

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: remove seawater temperature data file from databundle retrieval

* fix: update seawater temperature data source and improve region geometry handling

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: add rule and script for plotting coefficient of performance (COP) profiles of heat pumps

* fix: correct import paths for HeatSector and HeatSystemType in heat_system.py

* fix: update output paths for COP profiles to use 'graphs' directory

* feat: enhance COP data preparation to support multiple heat system types and improve plotting functionality

* refactor: streamline COP data preparation and enhance interactive plotting functionality

* feat: add region_dim parameter to prepare_cop_data function for enhanced flexibility

* fix: improve validation for regions_onshore and enhance aggregate_type handling in plot_heat_source_map function

* feat: add region_dim parameter to create_interactive_cop_plot function for improved region filtering

* feat: add rules for bus carrier dispatch and annual energy balance plots in Snakemake workflow

* refactor: update output paths for bus carrier dispatch plots and adjust memory resources in postprocess rules

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* use absolute imports (PyPSA#1643)

* use absolute imports

* add release note

* fix typo

* Non-sequestered HVC Waste Allocation According to Population (PyPSA#1625)

* non-sequestered HVC waste allocation according to population

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* adding release note and correcting link efficiencies

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* moving locations of non-sequestered hvc to 'spatial' variable

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Micha <[email protected]>

* fix: update fallback value for unusable water temperature from absolute zero to -1e9

* feat: enhance water heat potential models and improve data handling

- Added district heating area buffer configuration in config.default.yaml
- Updated plotting.default.yaml to include river and sea water heat sources
- Enhanced build_sector.smk to incorporate district heating area data
- Introduced retrieve_dh_areas rule in retrieve.smk for fetching district heating areas
- Refactored river_water_heat_approximator.py and sea_water_heat_approximator.py for improved data validation and processing
- Modified build_river_water_heat_potential.py and build_sea_water_heat_potential.py to handle district heating areas
- Improved plot_heat_source_map.py for better data filtering and error handling

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: correct unit in heat power calculation

* feat: clip COP bewlow 1 to 0

* refactor: simplify cop profile plotting

* refactor: streamline heat source retrieval and improve plot info

* refactor: simplify plot_bus_carrier_dispatch

* refactor: enhance plot_bus_carrier_dispatch with bus name pattern and output directory

* refactor: rename plot_bus_carrier_dispatch to plot_interactive_bus_balance and update output paths

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: reorder import statements for clarity

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* refactor: clean up whitespace in create_interactive_cop_plot function

* feat: remove sea-water by default but add heat pump sources sea-water and geothermal to myopic, overnight, and perfect test configuration files

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat: update limited heat sources in sector.csv to include river_water and clarify data source requirements

* refactor: remove outdated reference to heat_demand in data-retrieval.rst

* doc: update release notes

* doc: add interactive bus plotting to docs and test config

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: simplify output directory structure for heatmap timeseries in rule all

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update scripts/build_cop_profiles/BaseCopApproximator.py

Co-authored-by: Copilot <[email protected]>

* Update scripts/build_ambient_air_temperature_yearly_average.py

Co-authored-by: Copilot <[email protected]>

* Update rules/build_sector.smk

Co-authored-by: Copilot <[email protected]>

* Update rules/build_sector.smk

Co-authored-by: Copilot <[email protected]>

* fix: correct formatting of limited_heat_sources description in sector.csv

* refactor: remove redundant comments and clean up coefficient of performance calculation

* fix: update input_heat_source_temperature function to include 'ptes' in replace_names and adjust resource references

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: update input_heat_source_temperature and related rules for ptes naming conventions and output formatting

* fix: add plotly dependency to environment.yaml and linux-pinned.yaml

* fix: update bus_name_pattern in plotting configuration to None

* fix: update bus_name_pattern in plotting configuration to None

* compress hera data after download

* use curl instead of wget and nccopy

* refactor: revert back to uncompressed wget

* bugfix: add existing renewables consistent with renewable_carriers list (PyPSA#1717)

* feat: include existing capacities only for included renewable carriers

* bugfix: only add solar rooftop in distribution grid when solar included in config

* revert mock snakemake changes

* refactor: change to if not continue style to reduce diff

* Add offwind float to CCL (PyPSA#1725)

* Fix: Invalid aquifer shapes in build_ates_potentials (PyPSA#1724)

* fix: ensure aquifer geometries are valid in build_ates_potentials.py

* fix: add release note for fixing invalid aquifer shape geometries in build_ates_potentials.py

* feat: use bundle hera data for test cutout

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: pass heat_pump_cop_approximation configs correctly (PyPSA#1729)

* fix: forward heat_pump_cop_approximation config to CentralHeatingCopApproximator

* refactor: set correct heat source for ptes boosting and include titel/link to source for min_delta_t_lift

---------

Co-authored-by: Amos Schledorn <[email protected]>

* Fix ``plot_hydrogen_network`` : storage + Added CCL explantions in the configtables (PyPSA#1727)

* Add offwind float to CCL

* Update plot_hydrogen_network.py

Fix the code to plot the storage

* Update release_notes.rst

* Update solving.csv

Add precision for the CCL constraint (not working with a time resolution higher than 1h) + add indication on how to use agg_p_nom_limits

* fix: update method call to use 'cop()' instead of 'approximate_cop()' in get_cop function

* fix: remove unnecessary parentheses in cop() method call in get_cop function

* fix: update retrieve_hera_data rule to use config_provider for snapshot year in output paths

* fix: update retrieve_hera_data rule to use snapshot_year directly in output paths

* feat: introduce dh_area building and improve handling of missing dh_area countries

* update config

* doc: improve comments

* update gitignore

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* feat:improve performance

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix:p_max_pu and p_nom_max for geothermal heat source

* fix: update heat source handling in add_heat function

* fix: remove unused heat pump sources from configuration

* fix: add shipping sector and update zero cost settings for heat sources

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* doc:update release notes and docs

* fix: enable CO2 sequestration potential check in add_co2_tracking function

* refactor:  type hints and improved documentation

* refactor: enhance type hints and improve documentation in SurfaceWaterHeatApproximator

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update config

* feat: reintroduce default target for the 'all' rule

* refactor: update default parameters in RiverWaterHeatApproximator

* fix: correct snapshot retrieval method in retrieve.smk

* fix: improve handling of zero-cost heat sources in add_heat function

* fix: update mock_snakemake call to use correct script name for sea heat potential

* fix: correct default_target case in all rule and refactor snapshot_year assignment

* fix: ensure temporal aggregate is only deleted when generated in get_regional_result function

* fix: fix static config handling

* fix: update default min_outlet_temperature in RiverWaterHeatApproximator to 1C

* fix: update input parameters for build_river_heat_potential rule and correct mock_snakemake call

* feat: wrap heat_source_map output into input function

* fix: remove comment from generate_temporal_aggregates in plotting configuration

* Revert "feat: wrap heat_source_map output into input function"

This reverts commit e6306ca.

* fix: update heat source map configuration references in Snakefile and plotting defaults

* Update doc/configtables/sector.csv

Co-authored-by: Fabian Neumann <[email protected]>

* fix:only plot heat source maps for activated heat pump sources

* fix: correct description for enabling temporal aggregate maps for heat sources

* fix:activate interactive_bus_balance ("*central heat*") in test configs

* fix: improve warning message for missing heat source cost data

* fix: replace print statements with logger for missing countries handling

* fix: add bokeh and folium to environment dependencies

* fix: update heat source map configuration for river, sea, and ambient air sources

* fix: heat pump sources in test configs

* fix: update heat source map configuration to use 'air' instead of 'ambient_air'

* fix: update docstring formatting for RiverWaterHeatApproximator class

* fix: update URLs for river discharge and ambient temperature data to V2

* fix: simplify power calculation constants in SurfaceWaterHeatApproximator

* fix:cosmetic updates

* Update doc/configtables/plotting.csv

Co-authored-by: Fabian Neumann <[email protected]>

* Update doc/configtables/sector.csv

Co-authored-by: Fabian Neumann <[email protected]>

* fix: update interactive bus balance configuration in plotting.csv

* fix: update release notes

* fix: remove unused dynamic inputs for hera data retrieval

* fix: rename generate_temporal_aggregates to enable_heat_source_maps

* Update rules/retrieve.smk

Co-authored-by: Fabian Neumann <[email protected]>

* fix: update thread configuration for build_river_heat_potential rule

* fix: update HERA data retrieval URLs to version 1.0

* fix: improve readability of input_heat_source_temperature function

* fix:use move/storage + year wildcard in hera data retrieval

* fix: update pypsa version to 0.33.0 in environment.yaml

* fix: pypsa options usage

* fix: pin `pypsa>=0.34.0`

* Update locked environment files for all platforms (PyPSA#1832)

Co-authored-by: lkstrp <[email protected]>

* feat: support multi-year snapshots

* fix:re-add ptes temperature to build_cop_profiles rule

* fix: update output filenames for ptes direct utilisation and temperature profiles

* fix: update output filename for ptes direct utilisation profiles to include 's_' prefix

* fix: correct indentation for hydrogen_turbine in sector configuration

* feat: automate seawater temperature retrieval for custom weather years

* refactor:simplify weather data handling through xr.open_mfdataset

* feat: add rule to retrieve seawater temperature for 2013 and improve error handling in retrieval script

* fix: update output file naming conventions in ptes operations

* feat: enhance documentation and type hints in data retrieval and plotting scripts

* fix: update output filename for ptes direct utilisation profiles to include 'base'

* feat: conditionally define seawater temperature retrieval rules based on default cutout configuration

* fix: rename seawater temperature retrieval rule for 2013

* fix: update seawater temperature output filename to reflect 2013 data

* fix: update seawater temperature output filename for test cutout

* fix: update seawater temperature data for test cutout

* fix: update seawater temperature file references to 2013 data

* fix: update seawater temperature references for test cutout

* fix: streamline seawater temperature retrieval for test cutout and enhance logging

* fix: remove benchmark logging for seawater temperature retrieval

* feat: rename build_cop_approximator submodules to snakecase

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Resolve merge conflicts

* refactor: update district heating area configuration and improve heat pump cost handling

* fix: update rule name in mock_snakemake for testing in build_dh_areas script

* refactor: remove unnecessary comment to avoid circular imports in input_hera_data function

* refactor: update docstring for RiverWaterHeatApproximator to clarify parameters

* refactor: clarify parameters in docstring for RiverWaterHeatApproximator

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <[email protected]>
Co-authored-by: Toni <[email protected]>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Micha <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Daniel Rüdt <[email protected]>
Co-authored-by: JuliaSvn <[email protected]>
Co-authored-by: TomKae00 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <[email protected]>

* [github-actions.ci] Update locked envs (PyPSA#1867)

* Update locked environment files for all platforms

* trigger CI

---------

Co-authored-by: amos-schledorn <[email protected]>
Co-authored-by: Amos Schledorn <[email protected]>

* refactor: use snapshot_weightings to define nyears in build_transport_demand (PyPSA#1871)

* Add option to set minimum unit dispatch for electrolysis (PyPSA#1859)

* Add option to set minimum unit dispatch for electrolysis

* electrolysis p_min_pu documentation

* chore(deps): bump the github-actions group with 2 updates (PyPSA#1870)

Bumps the github-actions group with 2 updates: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/upload-artifact` from 4 to 5
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v4...v5)

Updates `actions/download-artifact` from 5 to 6
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v5...v6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/download-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix to allow osm-raw network building for islanded systems (PyPSA#1852)

* Modified building network script to allow for islanded network building (e.g. just Norway).

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <[email protected]>
Co-authored-by: Fabian Neumann <[email protected]>

* Fix by specifying axis (PyPSA#1835)

* Fix by specifying axis

* Add release notes

---------

Co-authored-by: Fabian Neumann <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: lkstrp <[email protected]>
Co-authored-by: Thomas Gilon <[email protected]>
Co-authored-by: Will Usher <[email protected]>
Co-authored-by: Johannes HAMPP <[email protected]>
Co-authored-by: Bobby Xiong <[email protected]>
Co-authored-by: Bryn Pickering <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lukas Trippe <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Amos Schledorn <[email protected]>
Co-authored-by: Toni <[email protected]>
Co-authored-by: Fabian Neumann <[email protected]>
Co-authored-by: Micha <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Daniel Rüdt <[email protected]>
Co-authored-by: JuliaSvn <[email protected]>
Co-authored-by: TomKae00 <[email protected]>
Co-authored-by: Amos Schledorn <[email protected]>
Co-authored-by: Markus Millinger <[email protected]>
Co-authored-by: jonathan-peel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants