From e0eb08b90f82a9fa739255716f168fb0446e8cfa Mon Sep 17 00:00:00 2001 From: martacki Date: Fri, 4 Mar 2022 13:54:04 +0100 Subject: [PATCH] include ua in countries --- Snakefile | 22 ---------------------- config.default.yaml | 4 +++- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Snakefile b/Snakefile index 4b8fa0b3..a67dad13 100644 --- a/Snakefile +++ b/Snakefile @@ -182,28 +182,6 @@ if config['enable'].get('retrieve_natura_raster', True): run: move(input[0], output[0]) -rule build_renewable_profiles: - input: - base_network="networks/base.nc", - corine="data/bundle/corine/g250_clc06_V18_5.tif", - natura="resources/natura.tiff", - gebco=lambda w: ("data/bundle/GEBCO_2014_2D.nc" - if "max_depth" in config["renewable"][w.technology].keys() - else []), - country_shapes='resources/country_shapes.geojson', - offshore_shapes='resources/offshore_shapes.geojson', - regions=lambda w: ("resources/regions_onshore.geojson" - if w.technology in ('onwind', 'solar') - else "resources/regions_offshore.geojson"), - cutout=lambda w: "cutouts/" + config["renewable"][w.technology]['cutout'] + ".nc" - output: profile="resources/profile_{technology}.nc", - log: "logs/build_renewable_profile_{technology}.log" - benchmark: "benchmarks/build_renewable_profiles_{technology}" - threads: ATLITE_NPROCESSES - resources: mem_mb=ATLITE_NPROCESSES * 5000 - script: "scripts/build_renewable_profiles.py" - - if 'hydro' in config['renewable'].keys(): rule build_hydro_profile: input: diff --git a/config.default.yaml b/config.default.yaml index d2bf6159..6a6322f3 100755 --- a/config.default.yaml +++ b/config.default.yaml @@ -17,7 +17,7 @@ scenario: clusters: [37, 128, 256, 512, 1024] opts: [Co2L-3H] -countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'ME', 'MK', 'NL', 'NO', 'PL', 'PT', 'RO', 'RS', 'SE', 'SI', 'SK'] +countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'ME', 'MK', 'NL', 'NO', 'PL', 'PT', 'RO', 'RS', 'SE', 'SI', 'SK', 'UA'] clustering: simplify: @@ -308,6 +308,7 @@ plotting: "HVDC links" : "#8a1caf" "DC-DC" : "#8a1caf" "DC link" : "#8a1caf" + "load": "#dd2e23" nice_names: OCGT: "Open-Cycle Gas" CCGT: "Combined-Cycle Gas" @@ -321,3 +322,4 @@ plotting: H2: "Hydrogen Storage" lines: "Transmission Lines" ror: "Run of River" + load: "Load Shedding"