Skip to content

Commit 73fb005

Browse files
bobbyxngpre-commit-ci[bot]fneum
authored
Feature: Interactive balance maps (#1935)
* Renamed original static plotting to '_static' and changed all map outputs to 'RESULTS + maps/static/...'. Maps in resources are not touched. * Fix: Updated config_providers to read updated config key 'balance_map_static.' * Interactive map implementation and static map plotting refactoring. * removed H2 vmin and vmax. * Dropped enable toggle. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * removed test config. * Restore build_energy_totals from master * Reverted to old plotting keys for balance_maps and changed balance_map_static back to balance_map * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Reordered plotting.default.yaml and added configtables for interactive maps. * Added release notes. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
1 parent 36f4a17 commit 73fb005

File tree

8 files changed

+573
-120
lines changed

8 files changed

+573
-120
lines changed

Snakefile

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ rule all:
9494
),
9595
expand(
9696
RESULTS
97-
+ "maps/base_s_{clusters}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf",
97+
+ "maps/static/base_s_{clusters}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf",
9898
run=config["run"]["name"],
9999
**config["scenario"],
100100
),
@@ -107,7 +107,7 @@ rule all:
107107
lambda w: expand(
108108
(
109109
RESULTS
110-
+ "maps/base_s_{clusters}_{opts}_{sector_opts}-h2_network_{planning_horizons}.pdf"
110+
+ "maps/static/base_s_{clusters}_{opts}_{sector_opts}-h2_network_{planning_horizons}.pdf"
111111
if config_provider("sector", "H2_network")(w)
112112
else []
113113
),
@@ -117,7 +117,7 @@ rule all:
117117
lambda w: expand(
118118
(
119119
RESULTS
120-
+ "maps/base_s_{clusters}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf"
120+
+ "maps/static/base_s_{clusters}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf"
121121
if config_provider("sector", "gas_network")(w)
122122
else []
123123
),
@@ -132,15 +132,6 @@ rule all:
132132
),
133133
run=config["run"]["name"],
134134
),
135-
lambda w: expand(
136-
(
137-
RESULTS
138-
+ "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-balance_map_{carrier}.pdf"
139-
),
140-
**config["scenario"],
141-
run=config["run"]["name"],
142-
carrier=config_provider("plotting", "balance_map", "bus_carriers")(w),
143-
),
144135
expand(
145136
RESULTS
146137
+ "graphics/balance_timeseries/s_{clusters}_{opts}_{sector_opts}_{planning_horizons}",
@@ -157,7 +148,7 @@ rule all:
157148
lambda w: expand(
158149
(
159150
RESULTS
160-
+ "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_river_water.html"
151+
+ "maps/static/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_river_water.html"
161152
if config_provider("plotting", "enable_heat_source_maps")(w)
162153
and "river_water"
163154
in config_provider("sector", "heat_pump_sources", "urban central")(w)
@@ -169,7 +160,7 @@ rule all:
169160
lambda w: expand(
170161
(
171162
RESULTS
172-
+ "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_sea_water.html"
163+
+ "maps/static/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_sea_water.html"
173164
if config_provider("plotting", "enable_heat_source_maps")(w)
174165
and "sea_water"
175166
in config_provider("sector", "heat_pump_sources", "urban central")(w)
@@ -181,7 +172,7 @@ rule all:
181172
lambda w: expand(
182173
(
183174
RESULTS
184-
+ "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_ambient_air.html"
175+
+ "maps/static/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_temperature_map_ambient_air.html"
185176
if config_provider("plotting", "enable_heat_source_maps")(w)
186177
and "air"
187178
in config_provider("sector", "heat_pump_sources", "urban central")(w)
@@ -194,7 +185,7 @@ rule all:
194185
lambda w: expand(
195186
(
196187
RESULTS
197-
+ "maps/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_energy_map_river_water.html"
188+
+ "maps/static/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}-heat_source_energy_map_river_water.html"
198189
if config_provider("plotting", "enable_heat_source_maps")(w)
199190
and "river_water"
200191
in config_provider("sector", "heat_pump_sources", "urban central")(w)
@@ -221,6 +212,8 @@ rule all:
221212
run=config["run"]["name"],
222213
**config["scenario"],
223214
),
215+
lambda w: balance_map_paths("static", w),
216+
lambda w: balance_map_paths("interactive", w),
224217
default_target: True
225218

226219

0 commit comments

Comments
 (0)