make_summary.py: Fix so that it works with simpl != ""
Non-empty simpl is needed for cases where the resource resolution is higher than the network resolution, e.g. simpl = 70 cluster = 37m
This commit is contained in:
parent
17bf1e8c33
commit
bdb3c8886d
@ -579,11 +579,13 @@ if __name__ == "__main__":
|
|||||||
snakemake.output[item] = snakemake.config['summary_dir'] + '/{name}/csvs/{item}.csv'.format(name=snakemake.config['run'],item=item)
|
snakemake.output[item] = snakemake.config['summary_dir'] + '/{name}/csvs/{item}.csv'.format(name=snakemake.config['run'],item=item)
|
||||||
|
|
||||||
networks_dict = {(cluster,lv,opt+sector_opt) :
|
networks_dict = {(cluster,lv,opt+sector_opt) :
|
||||||
snakemake.config['results_dir'] + snakemake.config['run'] + '/postnetworks/elec_s_{cluster}_lv{lv}_{opt}_{sector_opt}.nc'\
|
snakemake.config['results_dir'] + snakemake.config['run'] + '/postnetworks/elec_s{simpl}_{cluster}_lv{lv}_{opt}_{sector_opt}.nc'\
|
||||||
.format(cluster=cluster,
|
.format(simpl=simpl,
|
||||||
|
cluster=cluster,
|
||||||
opt=opt,
|
opt=opt,
|
||||||
lv=lv,
|
lv=lv,
|
||||||
sector_opt=sector_opt)\
|
sector_opt=sector_opt)\
|
||||||
|
for simpl in snakemake.config['scenario']['simpl'] \
|
||||||
for cluster in snakemake.config['scenario']['clusters'] \
|
for cluster in snakemake.config['scenario']['clusters'] \
|
||||||
for opt in snakemake.config['scenario']['opts'] \
|
for opt in snakemake.config['scenario']['opts'] \
|
||||||
for sector_opt in snakemake.config['scenario']['sector_opts'] \
|
for sector_opt in snakemake.config['scenario']['sector_opts'] \
|
||||||
|
Loading…
Reference in New Issue
Block a user