From bb8363a650bc830351b321384d42a4e856941e10 Mon Sep 17 00:00:00 2001 From: Koen van Greevenbroek <74298901+koen-vg@users.noreply.github.com> Date: Wed, 18 Sep 2024 16:28:03 +0200 Subject: [PATCH] Add {sector_opts} wildcard to snapshot_weightings output (#1307) This restores the functionality of time-aggregation wildcards for sector-coupled networks. --- rules/build_sector.smk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/build_sector.smk b/rules/build_sector.smk index bd19fef34..4ba1f45b4 100755 --- a/rules/build_sector.smk +++ b/rules/build_sector.smk @@ -941,15 +941,15 @@ rule time_aggregation: ), output: snapshot_weightings=resources( - "snapshot_weightings_base_s_{clusters}_elec_l{ll}_{opts}.csv" + "snapshot_weightings_base_s_{clusters}_elec_l{ll}_{opts}_{sector_opts}.csv" ), threads: 1 resources: mem_mb=5000, log: - logs("time_aggregation_base_s_{clusters}_elec_l{ll}_{opts}.log"), + logs("time_aggregation_base_s_{clusters}_elec_l{ll}_{opts}_{sector_opts}.log"), benchmark: - benchmarks("time_aggregation_base_s_{clusters}_elec_l{ll}_{opts}") + benchmarks("time_aggregation_base_s_{clusters}_elec_l{ll}_{opts}_{sector_opts}") conda: "../envs/environment.yaml" script: @@ -1021,7 +1021,7 @@ rule prepare_sector_network: **rules.cluster_gas_network.output, **rules.build_gas_input_locations.output, snapshot_weightings=resources( - "snapshot_weightings_base_s_{clusters}_elec_l{ll}_{opts}.csv" + "snapshot_weightings_base_s_{clusters}_elec_l{ll}_{opts}_{sector_opts}.csv" ), retro_cost=lambda w: ( resources("retro_cost_base_s_{clusters}.csv")