From 3afacfeaccc596aa0fe3464004d9244ad285b64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6rsch?= Date: Mon, 3 Sep 2018 20:19:45 +0200 Subject: [PATCH] base_network, config: Links do not follow the n-1 constraint --- config.yaml | 2 +- scripts/base_network.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config.yaml b/config.yaml index 1b949f74..9c8cf0f9 100644 --- a/config.yaml +++ b/config.yaml @@ -113,7 +113,7 @@ lines: under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity links: - s_max_pu: 0.7 + p_max_pu: 1.0 under_construction: 'zero' # 'zero': set capacity to zero, 'remove': remove, 'keep': with full capacity transformers: diff --git a/scripts/base_network.py b/scripts/base_network.py index 2c810bca..2afe15a0 100644 --- a/scripts/base_network.py +++ b/scripts/base_network.py @@ -129,8 +129,9 @@ def _set_lines_s_nom_from_linetypes(n): ) def _set_electrical_parameters_links(links): - links['p_max_pu'] = snakemake.config['links']['s_max_pu'] - links['p_min_pu'] = -1. * snakemake.config['links']['s_max_pu'] + p_max_pu = snakemake.config['links'].get('p_max_pu', 1.) + links['p_max_pu'] = p_max_pu + links['p_min_pu'] = -p_max_pu links_p_nom = pd.read_csv(snakemake.input.links_p_nom) @@ -156,8 +157,9 @@ def _set_electrical_parameters_links(links): return links def _set_electrical_parameters_converters(converters): - converters['p_max_pu'] = snakemake.config['links']['s_max_pu'] - converters['p_min_pu'] = -1. * snakemake.config['links']['s_max_pu'] + p_max_pu = snakemake.config['links'].get('p_max_pu', 1.) + converters['p_max_pu'] = p_max_pu + converters['p_min_pu'] = -p_max_pu converters['p_nom'] = 2000