Add {sector_opts} wildcard to snapshot_weightings output (#1307)
This restores the functionality of time-aggregation wildcards for sector-coupled networks.
This commit is contained in:
parent
9420c9081e
commit
bb8363a650
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user