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

resolve merge conflict

Browse Source
This commit is contained in:
Fabian Neumann 2024-01-25 20:51:51 +01:00
parent 5fcfafe971
commit 7becfdea9c
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Snakefile
View File

@ -75,7 +75,7 @@ if config["foresight"] == "perfect":
rule all: rule all:
input: input:
RESULTS + "graphs/costs.pdf", RESULTS + "graphs/costs.pdf",
expand(RESULTS + "maps/power-network-{clusters}.pdf", **config["scenario"]), expand(RESULTS + "maps/power-network-s{simpl}-{clusters}.pdf", **config["scenario"]),
expand( expand(
RESULTS 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",

3
rules/postprocess.smk
View File

@ -16,9 +16,8 @@ if config["foresight"] != "perfect":
network=RESOURCES + "networks/elec_s{simpl}_{clusters}.nc", network=RESOURCES + "networks/elec_s{simpl}_{clusters}.nc",
regions_onshore=RESOURCES regions_onshore=RESOURCES
+ "regions_onshore_elec_s{simpl}_{clusters}.geojson", + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
rc="matplotlibrc",
output: output:
map=RESULTS + "maps/power-network-{clusters}.pdf", map=RESULTS + "maps/power-network-s{simpl}-{clusters}.pdf",
threads: 1 threads: 1
resources: resources:
mem_mb=4000, mem_mb=4000,

2
scripts/plot_power_network_clustered.py
View File

@ -24,8 +24,6 @@ if __name__ == "__main__":
configfiles=["../../config/config.test.yaml"], configfiles=["../../config/config.test.yaml"],
) )
plt.style.use(snakemake.input.rc)
lw_factor = 2e3 lw_factor = 2e3
n = pypsa.Network(snakemake.input.network) n = pypsa.Network(snakemake.input.network)