From bab51b0f54697c22c973ab0c5ee22b9edb05c63a Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 10 Aug 2021 10:28:22 +0200 Subject: [PATCH] fix read-in of pypsa-eur data --- Snakefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Snakefile b/Snakefile index 286df421..498cc7c9 100644 --- a/Snakefile +++ b/Snakefile @@ -24,7 +24,6 @@ subworkflow pypsaeur: snakefile: "../pypsa-eur/Snakefile" configfile: "../pypsa-eur/config.yaml" - rule all: input: SDIR + '/graphs/costs.pdf' @@ -176,9 +175,9 @@ rule build_biomass_potentials: enspreso_biomass=HTTP.remote("https://cidportal.jrc.ec.europa.eu/ftp/jrc-opendata/ENSPRESO/ENSPRESO_BIOMASS.xlsx", keep_local=True), nuts2="data/nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson", # https://gisco-services.ec.europa.eu/distribution/v2/nuts/download/#nuts21 regions_onshore=pypsaeur("resources/regions_onshore_elec_s{simpl}_{clusters}.geojson"), - nuts3_population=pypsaeur("data/bundle/nama_10r_3popgdp.tsv.gz"), - swiss_cantons=pypsaeur("data/bundle/ch_cantons.csv"), - swiss_population=pypsaeur("data/bundle/je-e-21.03.02.xls"), + nuts3_population="../pypsa-eur/data/bundle/nama_10r_3popgdp.tsv.gz", + swiss_cantons="../pypsa-eur/data/bundle/ch_cantons.csv", + swiss_population="../pypsa-eur/data/bundle/je-e-21.03.02.xls", country_shapes=pypsaeur('resources/country_shapes.geojson') output: biomass_potentials_all='resources/biomass_potentials_all_s{simpl}_{clusters}.csv',