From 4397f1fd0c52cc4454b231720d92cfdfeb29c1f3 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 18 Feb 2022 11:32:06 +0100 Subject: [PATCH] minor fixes --- Snakefile | 2 +- config.default.yaml | 2 -- scripts/build_population_layouts.py | 5 ++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Snakefile b/Snakefile index c0c1c7fa..4efb15f1 100644 --- a/Snakefile +++ b/Snakefile @@ -12,7 +12,7 @@ configfile: "config.yaml" wildcard_constraints: - year="[0-9]*", + weather_year="[0-9]*", lv="[a-z0-9\.]+", simpl="[a-zA-Z0-9]*", clusters="[0-9]+m?", diff --git a/config.default.yaml b/config.default.yaml index 010c31d3..63dcab51 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -65,8 +65,6 @@ snapshots: end: "2014-01-01" closed: left # end is not inclusive -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'] - atlite: cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc diff --git a/scripts/build_population_layouts.py b/scripts/build_population_layouts.py index e83dd5f3..a5ae2ebf 100644 --- a/scripts/build_population_layouts.py +++ b/scripts/build_population_layouts.py @@ -12,7 +12,10 @@ from vresutils import shapes as vshapes if __name__ == '__main__': if 'snakemake' not in globals(): from helper import mock_snakemake - snakemake = mock_snakemake('build_population_layouts', year='') + snakemake = mock_snakemake( + 'build_population_layouts', + weather_year='', + ) year = snakemake.wildcards.weather_year cutout_config = snakemake.config['atlite']['cutout']