bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add {sector_opts} wildcard to snapshot_weightings output (#1307)

Browse Source 
This restores the functionality of time-aggregation wildcards for
sector-coupled networks.
This commit is contained in:
Koen van Greevenbroek 2024-09-18 16:28:03 +02:00 committed by GitHub
parent 9420c9081e
commit bb8363a650
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rules/build_sector.smk
View File

@ -941,15 +941,15 @@ rule time_aggregation:
), ),
output: output:
snapshot_weightings=resources( 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 threads: 1
resources: resources:
mem_mb=5000, mem_mb=5000,
log: 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: benchmark:
benchmarks("time_aggregation_base_s_{clusters}_elec_l{ll}_{opts}") benchmarks("time_aggregation_base_s_{clusters}_elec_l{ll}_{opts}_{sector_opts}")
conda: conda:
"../envs/environment.yaml" "../envs/environment.yaml"
script: script:
@ -1021,7 +1021,7 @@ rule prepare_sector_network:
**rules.cluster_gas_network.output, **rules.cluster_gas_network.output,
**rules.build_gas_input_locations.output, **rules.build_gas_input_locations.output,
snapshot_weightings=resources( 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: ( retro_cost=lambda w: (
resources("retro_cost_base_s_{clusters}.csv") resources("retro_cost_base_s_{clusters}.csv")