From 546d9b0610cb94d48f7fa5955693af82bf795f43 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 2 Jun 2023 17:27:24 +0200 Subject: [PATCH] adjust new rules to merged format --- config/config.default.yaml | 1 + rules/build_electricity.smk | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config/config.default.yaml b/config/config.default.yaml index d2d548e9..def7b36f 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -266,6 +266,7 @@ lines: s_nom_max: .inf length_factor: 1.25 under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity + cutout: europe-2013-era5 dynamic_line_rating: activate: false # factor compensate overestimation of the wind speed in hourly averaged wind data diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk index 6d27e4fa..fc19cf46 100644 --- a/rules/build_electricity.smk +++ b/rules/build_electricity.smk @@ -252,17 +252,20 @@ rule build_hydro_profile: if config['lines']['dynamic_line_rating']['activate']: - rule build_line_rating: + rule build_line_rating:cutouts input: - base_network="networks/base.nc", - cutout="cutouts/" + config["lines"]['cutout'] + ".nc" + base_network=RESOURCES + "networks/base.nc", + cutout="cutouts/" + CDIR + config["lines"]['cutout'] + ".nc" output: - output="resources/line_rating.nc" - log: "logs/build_line_rating.log" - benchmark: "benchmarks/build_line_rating" + output=RESOURCES + "networks/line_rating.nc" + log: LOGS + "build_line_rating.log" + benchmark: BENCHMARKS + "build_line_rating" threads: ATLITE_NPROCESSES resources: mem_mb=ATLITE_NPROCESSES * 1000 - script: "scripts/build_line_rating.py" + conda: + "../envs/environment.yaml" + script: + "../scripts/build_line_rating.py" rule add_electricity: @@ -278,7 +281,7 @@ rule add_electricity: if str(fn).startswith("data/") }, base_network=RESOURCES + "networks/base.nc", - line_rating="resources/line_rating.nc" if config['lines']['dynamic_line_rating']['activate'] else "networks/base.nc", + line_rating=RESOURCES + "networks/line_rating.nc" if config['lines']['dynamic_line_rating']['activate'] else RESOURCES + "networks/base.nc", tech_costs=COSTS, regions=RESOURCES + "regions_onshore.geojson", powerplants=RESOURCES + "powerplants.csv",