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

Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear

Browse Source
This commit is contained in:
Fabian Neumann 2024-03-06 16:18:33 +01:00
commit 93e53e0b03
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rules/build_electricity.smk
View File

@ -25,9 +25,11 @@ rule build_electricity_demand:
load=config_provider("load"), load=config_provider("load"),
input: input:
reported=ancient("data/electricity_demand_raw.csv"), reported=ancient("data/electricity_demand_raw.csv"),
artificial=lambda w: ancient("data/load_artificial_raw.csv") artificial=lambda w: (
if config_provider("load", "supplement_missing_data_artificially")(w) ancient("data/load_artificial_raw.csv")
else [], if config_provider("load", "supplement_missing_data_artificially")(w)
else []
),
output: output:
resources("electricity_demand.csv"), resources("electricity_demand.csv"),
log: log:

23
rules/postprocess.smk
View File

@ -23,9 +23,7 @@ if config["foresight"] != "perfect":
resources: resources:
mem_mb=4000, mem_mb=4000,
benchmark: benchmark:
benchmarks( benchmarks("plot_power_network_clustered/elec_s{simpl}_{clusters}")
"plot_power_network_clustered/elec_s{simpl}_{clusters}"
)
conda: conda:
"../envs/environment.yaml" "../envs/environment.yaml"
script: script:
@ -37,9 +35,7 @@ if config["foresight"] != "perfect":
input: input:
network=RESULTS network=RESULTS
+ "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc", + "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
regions=resources( regions=resources("regions_onshore_elec_s{simpl}_{clusters}.geojson"),
"regions_onshore_elec_s{simpl}_{clusters}.geojson"
),
output: output:
map=RESULTS map=RESULTS
+ "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf", + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf",
@ -66,9 +62,7 @@ if config["foresight"] != "perfect":
input: input:
network=RESULTS network=RESULTS
+ "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc", + "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
regions=resources( regions=resources("regions_onshore_elec_s{simpl}_{clusters}.geojson"),
"regions_onshore_elec_s{simpl}_{clusters}.geojson"
),
output: output:
map=RESULTS map=RESULTS
+ "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-h2_network_{planning_horizons}.pdf", + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-h2_network_{planning_horizons}.pdf",
@ -94,9 +88,7 @@ if config["foresight"] != "perfect":
input: input:
network=RESULTS network=RESULTS
+ "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc", + "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
regions=resources( regions=resources("regions_onshore_elec_s{simpl}_{clusters}.geojson"),
"regions_onshore_elec_s{simpl}_{clusters}.geojson"
),
output: output:
map=RESULTS map=RESULTS
+ "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf", + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf",
@ -133,9 +125,7 @@ if config["foresight"] == "perfect":
input: input:
network=RESULTS network=RESULTS
+ "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years.nc", + "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_brownfield_all_years.nc",
regions=resources( regions=resources("regions_onshore_elec_s{simpl}_{clusters}.geojson"),
"regions_onshore_elec_s{simpl}_{clusters}.geojson"
),
output: output:
unpack(output_map_year), unpack(output_map_year),
threads: 2 threads: 2
@ -292,8 +282,7 @@ rule plot_elec_statistics:
plotting=config_provider("plotting"), plotting=config_provider("plotting"),
barplots=STATISTICS_BARPLOTS, barplots=STATISTICS_BARPLOTS,
input: input:
network=RESULTS network=RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
+ "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",
output: output:
**{ **{
f"{plot}_bar": RESULTS f"{plot}_bar": RESULTS