Skip to content

Commit e771732

Browse files
lindnemilindnemi
committed
reconcile changed paths
1 parent c598604 commit e771732

File tree

4 files changed

+21
-22
lines changed

4 files changed

+21
-22
lines changed

‎Snakefile

+10-11
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,7 @@ rule modify_prenetwork:
331331
scale_capacity=config_provider("scale_capacity"),
332332
input:
333333
costs_modifications="ariadne-data/costs_{planning_horizons}-modifications.csv",
334-
network=RESULTS
335-
+ "prenetworks-brownfield/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
334+
network=resources("networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}_brownfield.nc"),
336335
wkn=(
337336
resources("wasserstoff_kernnetz_base_s_{clusters}.csv")
338337
if config_provider("wasserstoff_kernnetz", "enable")
@@ -358,12 +357,12 @@ rule modify_prenetwork:
358357
offshore_connection_points="ariadne-data/offshore_connection_points.csv",
359358
output:
360359
network=RESULTS
361-
+ "prenetworks-final/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
360+
+ "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}_final.nc",
362361
resources:
363362
mem_mb=4000,
364363
log:
365364
RESULTS
366-
+ "logs/modify_prenetwork_base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.log",
365+
+ "logs/modify_prenetwork_base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.log",
367366
script:
368367
"scripts/pypsa-de/modify_prenetwork.py"
369368

@@ -525,7 +524,7 @@ rule export_ariadne_variables:
525524
),
526525
networks=expand(
527526
RESULTS
528-
+ "postnetworks/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
527+
+ "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc",
529528
**config["scenario"],
530529
allow_missing=True,
531530
),
@@ -617,7 +616,7 @@ rule ariadne_all:
617616
),
618617
expand(
619618
RESULTS
620-
+ "maps/base_s_{clusters}_l{ll}_{opts}_{sector_opts}-h2_network_incl_kernnetz_{planning_horizons}.pdf",
619+
+ "maps/base_s_{clusters}_{opts}_{sector_opts}-h2_network_incl_kernnetz_{planning_horizons}.pdf",
621620
run=config_provider("run", "name"),
622621
**config["scenario"],
623622
allow_missing=True,
@@ -652,21 +651,21 @@ rule plot_hydrogen_network_incl_kernnetz:
652651
foresight=config_provider("foresight"),
653652
input:
654653
network=RESULTS
655-
+ "postnetworks/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
654+
+ "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc",
656655
regions=resources("regions_onshore_base_s_{clusters}.geojson"),
657656
output:
658657
map=RESULTS
659-
+ "maps/base_s_{clusters}_l{ll}_{opts}_{sector_opts}-h2_network_incl_kernnetz_{planning_horizons}.pdf",
658+
+ "maps/base_s_{clusters}_{opts}_{sector_opts}-h2_network_incl_kernnetz_{planning_horizons}.pdf",
660659
threads: 2
661660
resources:
662661
mem_mb=10000,
663662
log:
664663
RESULTS
665-
+ "logs/plot_hydrogen_network_incl_kernnetz/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.log",
664+
+ "logs/plot_hydrogen_network_incl_kernnetz/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.log",
666665
benchmark:
667666
(
668667
RESULTS
669-
+ "benchmarks/plot_hydrogen_network_incl_kernnetz/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}"
668+
+ "benchmarks/plot_hydrogen_network_incl_kernnetz/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}"
670669
)
671670
script:
672671
"scripts/pypsa-de/plot_hydrogen_network_incl_kernnetz.py"
@@ -686,7 +685,7 @@ rule plot_ariadne_report:
686685
input:
687686
networks=expand(
688687
RESULTS
689-
+ "postnetworks/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
688+
+ "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc",
690689
**config["scenario"],
691690
allow_missing=True,
692691
),

‎rules/collect.smk

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ rule plot_statistics:
9797
),
9898
expand(
9999
RESULTS
100-
+ "statistics/figures/single/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/.statistics_{carrier}_plots",
100+
+ "statistics/figures/single/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/.statistics_{carrier}_plots",
101101
**config["scenario"],
102102
country=config["plotting"].get("countries", "all"),
103103
carrier=config["plotting"].get("carriers", ["all"]),

‎rules/postprocess.smk

+9-9
Original file line numberDiff line numberDiff line change
@@ -295,20 +295,20 @@ rule write_statistics:
295295
statistics=STATISTICS,
296296
input:
297297
network=RESULTS
298-
+ "postnetworks/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
298+
+ "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}.nc",
299299
output:
300300
**{
301301
f"{csv}": RESULTS
302-
+ "statistics/csv/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/{carrier}_"
302+
+ "statistics/csv/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/{carrier}_"
303303
+ f"{csv}.csv"
304304
for carrier in config["plotting"].get("carriers", "all")
305305
for csv in STATISTICS
306306
},
307307
csv_touch=RESULTS
308-
+ "statistics/csv/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/.statistics_{carrier}_csv",
308+
+ "statistics/csv/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/.statistics_{carrier}_csv",
309309
log:
310310
RESULTS
311-
+ "logs/write_statistics/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_country-{country}_carrier-{carrier}.log",
311+
+ "logs/write_statistics/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}_country-{country}_carrier-{carrier}.log",
312312
script:
313313
"../scripts/write_statistics.py"
314314

@@ -320,24 +320,24 @@ rule plot_statistics_single:
320320
input:
321321
**{
322322
f"{csv}": RESULTS
323-
+ "statistics/csv/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/{carrier}_"
323+
+ "statistics/csv/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/{carrier}_"
324324
+ f"{csv}.csv"
325325
for carrier in config["plotting"].get("carriers", "all")
326326
for csv in STATISTICS
327327
},
328328
output:
329329
**{
330330
f"{plot}": RESULTS
331-
+ "statistics/figures/single/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/{carrier}_"
331+
+ "statistics/figures/single/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/{carrier}_"
332332
+ f"{plot}.pdf"
333333
for carrier in config["plotting"].get("carriers", "all")
334334
for plot in STATISTICS
335335
},
336336
barplots_touch=RESULTS
337-
+ "statistics/figures/single/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/.statistics_{carrier}_plots",
337+
+ "statistics/figures/single/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/.statistics_{carrier}_plots",
338338
log:
339339
RESULTS
340-
+ "logs/plot_statistics_single/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}_country-{country}_carrier-{carrier}.log",
340+
+ "logs/plot_statistics_single/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}_country-{country}_carrier-{carrier}.log",
341341
script:
342342
"../scripts/plot_statistics_single.py"
343343

@@ -349,7 +349,7 @@ rule plot_statistics_comparison:
349349
input:
350350
expand(
351351
RESULTS
352-
+ "statistics/csv/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/{carrier}_{csv}.csv",
352+
+ "statistics/csv/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}/country_{country}/{carrier}_{csv}.csv",
353353
**config["scenario"],
354354
csv=STATISTICS,
355355
allow_missing=True,

‎rules/solve_myopic.smk

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ rule solve_sector_network_myopic:
120120
energy_year=config_provider("energy", "energy_totals_year"),
121121
input:
122122
network=RESULTS
123-
+ "prenetworks-final/base_s_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
123+
+ "networks/base_s_{clusters}_{opts}_{sector_opts}_{planning_horizons}_final.nc",
124124
co2_totals_name=resources("co2_totals.csv"),
125125
energy_totals=resources("energy_totals.csv"),
126126
output:

0 commit comments

Comments
 (0)