From 9825fa32b24a1018472555d66cb8a0615278353c Mon Sep 17 00:00:00 2001 From: martacki Date: Tue, 1 Jun 2021 12:00:55 +0200 Subject: [PATCH] change layout of configuration settings --- config.default.yaml | 4 +++- config.tutorial.yaml | 4 +++- scripts/simplify_network.py | 2 +- test/config.test1.yaml | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index 6df2c446..51721729 100755 --- a/config.default.yaml +++ b/config.default.yaml @@ -19,7 +19,9 @@ scenario: 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'] -simplify_to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections) +clustering: + simplify: + to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections) snapshots: start: "2013-01-01" diff --git a/config.tutorial.yaml b/config.tutorial.yaml index 4ddb6830..e551e460 100755 --- a/config.tutorial.yaml +++ b/config.tutorial.yaml @@ -19,7 +19,9 @@ scenario: countries: ['DE'] -simplify_to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections) +clustering: + simplify: + to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections) snapshots: start: "2013-03-01" diff --git a/scripts/simplify_network.py b/scripts/simplify_network.py index 72d0dbb7..309e94ff 100644 --- a/scripts/simplify_network.py +++ b/scripts/simplify_network.py @@ -399,7 +399,7 @@ if __name__ == "__main__": busmaps = [trafo_map, simplify_links_map, stub_map] - if snakemake.config['simplify_to_substations']: + if snakemake.config['clustering']['simplify']['to_substations']: n, substation_map = aggregate_to_substations(n) busmaps.append(substation_map) diff --git a/test/config.test1.yaml b/test/config.test1.yaml index 39b2ef8e..a5dadc65 100755 --- a/test/config.test1.yaml +++ b/test/config.test1.yaml @@ -18,7 +18,9 @@ scenario: countries: ['DE'] -simplify_to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections) +clustering: + simplify: + to_substations: false # network is simplified to nodes with positive or negative power injection (i.e. substations or offwind connections) snapshots: start: "2013-03-01"