Skip to content

feat: add river-water and sea-water sourced heat pumps #1618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 98 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 90 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
8408c17
feat: add river-water and sea-water heat pumps
amos-schledorn Mar 28, 2025
7034685
remove obsolete modules
amos-schledorn Mar 28, 2025
8280103
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 28, 2025
20e462b
Merge remote-tracking branch 'origin/master' into add-water-sourced-h…
amos-schledorn Apr 2, 2025
bd899b2
feat: add copernicusmarine to envs
amos-schledorn Apr 2, 2025
257e11f
Merge branch 'master' into add-water-sourced-heat-pumps
amos-schledorn Apr 2, 2025
293b694
Merge branch 'master' into add-water-sourced-heat-pumps
amos-schledorn Apr 3, 2025
721394d
feat: Add option to disable progress bar in seawater data retrieval s…
amos-schledorn Apr 3, 2025
57b7676
Merge branch 'master' into add-water-sourced-heat-pumps
amos-schledorn Apr 3, 2025
f2d0fb5
Merge branch 'master' into add-water-sourced-heat-pumps
amos-schledorn Apr 3, 2025
ada12e4
fix: Ensure temperature difference is non-negative in heat flow calcu…
amos-schledorn Apr 3, 2025
31d452b
fix: Impose cut-off temperature for sea water heat
amos-schledorn Apr 3, 2025
71da407
feat: Add temporal aggregation for river and sea water heat potential…
amos-schledorn Apr 3, 2025
812e47c
Merge remote-tracking branch 'origin/master' into add-water-sourced-h…
amos-schledorn Apr 3, 2025
bb15bcb
Merge remote-tracking branch 'origin/add-water-sourced-heat-pumps' in…
amos-schledorn Apr 3, 2025
32e2945
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 3, 2025
b360d86
chore: Add SPDX license identifiers to surface water heat potential s…
amos-schledorn Apr 3, 2025
6b6282c
Merge remote-tracking branch 'origin/add-water-sourced-heat-pumps' in…
amos-schledorn Apr 3, 2025
a80c911
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 3, 2025
9c2b57f
fix: Use no-verbose mode for wget when retrieving hera data
amos-schledorn Apr 3, 2025
9b131b2
fix: typos
amos-schledorn Apr 3, 2025
ed14e0d
Merge remote-tracking branch 'origin/add-water-sourced-heat-pumps' in…
amos-schledorn Apr 3, 2025
26f6485
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 3, 2025
78fc0e6
fix: update chunking parameters for river and ambient temperature dat…
amos-schledorn Apr 3, 2025
4dc756d
Merge remote-tracking branch 'origin/add-water-sourced-heat-pumps' in…
amos-schledorn Apr 3, 2025
b5296ff
Merge branch 'master' into add-water-sourced-heat-pumps
amos-schledorn Apr 3, 2025
4e2fea2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 3, 2025
16ebfe0
doc:: update data bundle docs to include Copernicus seawater temperat…
amos-schledorn Apr 4, 2025
6cc5c91
Merge branch 'master' into add-water-sourced-heat-pumps
amos-schledorn Apr 4, 2025
e23700d
refactor: update seawater temperature data path to bundle, add file t…
amos-schledorn Apr 4, 2025
662a8ff
Merge remote-tracking branch 'origin/add-water-sourced-heat-pumps' in…
amos-schledorn Apr 4, 2025
19d8b99
feat: update seawater data retrieval
amos-schledorn Apr 7, 2025
a9254ce
fix: import shapely correctly in sea_water_heat_approximator.py
amos-schledorn Apr 7, 2025
402b934
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 7, 2025
8c596ba
refactor: streamline temporal aggregate merging
amos-schledorn Apr 9, 2025
fb41147
feat: add heat source mapping functionality and ambient air temperatu…
amos-schledorn Apr 9, 2025
f138747
Merge remote-tracking branch 'origin/master' into add-water-sourced-h…
amos-schledorn Apr 10, 2025
2ebd8d5
fix: correct region geometry buffering in SeaWaterHeatApproximator
amos-schledorn Apr 10, 2025
bab6d50
feat: enhance heat source map with aggregation options for temperatur…
amos-schledorn Apr 10, 2025
5bbc8fd
Merge remote-tracking branch 'origin/add-water-sourced-heat-pumps' in…
amos-schledorn Apr 10, 2025
11f9195
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 10, 2025
6cfdfc7
fix: remove seawater temperature data file from databundle retrieval
amos-schledorn Apr 10, 2025
cb4d754
fix: update seawater temperature data source and improve region geome…
amos-schledorn Apr 11, 2025
cd7dc05
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 11, 2025
7fb1975
feat: add rule and script for plotting coefficient of performance (CO…
amos-schledorn Apr 12, 2025
44c54e2
fix: correct import paths for HeatSector and HeatSystemType in heat_s…
amos-schledorn Apr 14, 2025
34f667d
fix: update output paths for COP profiles to use 'graphs' directory
amos-schledorn Apr 14, 2025
572c844
feat: enhance COP data preparation to support multiple heat system ty…
amos-schledorn Apr 14, 2025
7944be3
refactor: streamline COP data preparation and enhance interactive plo…
amos-schledorn Apr 14, 2025
31a8ac0
feat: add region_dim parameter to prepare_cop_data function for enhan…
amos-schledorn Apr 14, 2025
b8943e8
fix: improve validation for regions_onshore and enhance aggregate_typ…
amos-schledorn Apr 14, 2025
acdef0e
feat: add region_dim parameter to create_interactive_cop_plot functio…
amos-schledorn Apr 14, 2025
7984468
feat: add rules for bus carrier dispatch and annual energy balance pl…
amos-schledorn Apr 14, 2025
4e82dbb
refactor: update output paths for bus carrier dispatch plots and adju…
amos-schledorn Apr 23, 2025
82a3809
Merge remote-tracking branch 'origin/master' into add-water-sourced-h…
amos-schledorn Apr 23, 2025
9f3d839
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 23, 2025
caee0f6
use absolute imports (#1643)
lkstrp Apr 25, 2025
6037735
Non-sequestered HVC Waste Allocation According to Population (#1625)
toniseibold Apr 25, 2025
5befde1
fix: update fallback value for unusable water temperature from absolu…
amos-schledorn Apr 29, 2025
7271af6
Merge remote-tracking branch 'origin/master' into add-water-sourced-h…
amos-schledorn Apr 29, 2025
432fadf
Merge remote-tracking branch 'origin/master' into add-water-sourced-h…
amos-schledorn May 7, 2025
38b3918
feat: enhance water heat potential models and improve data handling
amos-schledorn May 9, 2025
daa2a3c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 9, 2025
967db38
fix: correct unit in heat power calculation
amos-schledorn May 9, 2025
0019a7b
Merge remote-tracking branch 'origin/master' into add-water-sourced-h…
amos-schledorn May 14, 2025
f6314dd
feat: clip COP bewlow 1 to 0
amos-schledorn May 16, 2025
e369427
refactor: simplify cop profile plotting
amos-schledorn May 16, 2025
0c44b23
refactor: streamline heat source retrieval and improve plot info
amos-schledorn May 16, 2025
4ad38a1
refactor: simplify plot_bus_carrier_dispatch
amos-schledorn May 20, 2025
6314ad0
refactor: enhance plot_bus_carrier_dispatch with bus name pattern and…
amos-schledorn May 26, 2025
7dd864f
refactor: rename plot_bus_carrier_dispatch to plot_interactive_bus_ba…
amos-schledorn May 26, 2025
e87ffc2
Merge remote-tracking branch 'origin/master' into add-water-sourced-h…
amos-schledorn May 26, 2025
d2e9c08
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 26, 2025
33b8a36
refactor: reorder import statements for clarity
amos-schledorn May 26, 2025
777b5e6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 26, 2025
28bf0f2
refactor: clean up whitespace in create_interactive_cop_plot function
amos-schledorn May 26, 2025
f568b45
feat: remove sea-water by default but add heat pump sources sea-water…
amos-schledorn May 26, 2025
65f6c70
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 26, 2025
96b9bb4
feat: update limited heat sources in sector.csv to include river_wate…
amos-schledorn May 26, 2025
2e1a918
refactor: remove outdated reference to heat_demand in data-retrieval.rst
amos-schledorn May 26, 2025
d8f090f
doc: update release notes
amos-schledorn May 26, 2025
904f006
doc: add interactive bus plotting to docs and test config
amos-schledorn May 26, 2025
d0baf21
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 26, 2025
2dab209
fix: simplify output directory structure for heatmap timeseries in ru…
amos-schledorn May 26, 2025
0f93d4c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 26, 2025
4807991
Update scripts/build_cop_profiles/BaseCopApproximator.py
amos-schledorn May 26, 2025
451084d
Update scripts/build_ambient_air_temperature_yearly_average.py
amos-schledorn May 26, 2025
778a74d
Update rules/build_sector.smk
amos-schledorn May 26, 2025
4bf9f38
Update rules/build_sector.smk
amos-schledorn May 26, 2025
9bbe720
fix: correct formatting of limited_heat_sources description in sector…
amos-schledorn May 26, 2025
5c4de70
refactor: remove redundant comments and clean up coefficient of perfo…
amos-schledorn May 26, 2025
fecbef5
fix: update input_heat_source_temperature function to include 'ptes' …
amos-schledorn May 26, 2025
b3f4588
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 26, 2025
c35369a
fix: update input_heat_source_temperature and related rules for ptes …
amos-schledorn May 26, 2025
4d40957
fix: add plotly dependency to environment.yaml and linux-pinned.yaml
amos-schledorn May 26, 2025
7e4514c
fix: update bus_name_pattern in plotting configuration to None
amos-schledorn May 27, 2025
ebd1f9b
fix: update bus_name_pattern in plotting configuration to None
amos-schledorn May 28, 2025
c8224b1
Merge branch 'master' into add-water-sourced-heat-pumps
amos-schledorn Jun 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 60 additions & 11 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,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
Expand Down Expand Up @@ -126,23 +132,66 @@ rule all:
run=config["run"]["name"],
carrier=config_provider("plotting", "balance_map", "bus_carriers")(w),
),
directory(
expand(
# Explicitly list heat source types for temperature maps
lambda w: expand(
(
RESULTS
+ "graphics/balance_timeseries/s_{clusters}_{opts}_{sector_opts}_{planning_horizons}",
run=config["run"]["name"],
**config["scenario"],
+ "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_river_water.html"
if config_provider("plotting", "heat_source_map", "enable")(w)
else []
),
**config["scenario"],
run=config["run"]["name"],
),
directory(
expand(
lambda w: expand(
(
RESULTS
+ "graphics/heatmap_timeseries/s_{clusters}_{opts}_{sector_opts}_{planning_horizons}",
run=config["run"]["name"],
**config["scenario"],
+ "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_sea_water.html"
if config_provider("plotting", "heat_source_map", "enable")(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", "heat_source_map", "enable")(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", "heat_source_map", "enable")(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


rule create_scenarios:
Expand Down
Loading
Loading