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

Merge branch 'master' into misc/precommit-ci-2

Browse Source
This commit is contained in:
Fabian Hofmann 2022-09-19 12:06:23 +02:00 committed by GitHub
commit 5833556ea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Snakefile
View File

@ -380,18 +380,12 @@ rule build_renewable_profiles:
rule build_hydro_profile: rule build_hydro_profile:
input: input:
country_shapes="resources/" + RDIR + "country_shapes.geojson", country_shapes="resources/" + RDIR + "country_shapes.geojson",
eia_hydro_generation="data/eia_hydro_annual_generation.csv", eia_hydro_generation='data/eia_hydro_annual_generation.csv',
cutout=f"cutouts/" + CDIR + "{config['renewable']['hydro']['cutout']}.nc" cutout=f"cutouts/" + CDIR + config['renewable']['hydro']['cutout'] + ".nc" if "hydro" in config["renewable"] else [],
if "hydro" in config["renewable"] output: "resources/" + RDIR + "profile_hydro.nc"
else "config['renewable']['hydro']['cutout'] not configured", log: "logs/" + RDIR + "build_hydro_profile.log"
output: resources: mem_mb=5000
"resources/" + RDIR + "profile_hydro.nc", script: 'scripts/build_hydro_profile.py'
log:
"logs/" + RDIR + "build_hydro_profile.log",
resources:
mem_mb=5000,
script:
"scripts/build_hydro_profile.py"
rule add_electricity: rule add_electricity: