From 265ef2739470208284a4f2e4494fe62f0c807b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6rsch?= Date: Mon, 3 Sep 2018 23:46:30 +0200 Subject: [PATCH] fixup! base_network, config: Links do not follow the n-1 constraint --- scripts/simplify_network.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/simplify_network.py b/scripts/simplify_network.py index 9ef2fc74..549824bc 100644 --- a/scripts/simplify_network.py +++ b/scripts/simplify_network.py @@ -141,15 +141,15 @@ def simplify_links(n): busmap.loc[buses] = b[np.r_[0, m.argmin(axis=0), 1]] all_links = [i for _, i in sum(links, [])] - s_max_pu = snakemake.config['links']['s_max_pu'] name = n.links.loc[all_links, 'length'].idxmax() + '+{}'.format(len(links) - 1) + p_max_pu = snakemake.config['links'].get('p_max_pu', 1.) params = dict( carrier='DC', bus0=b[0], bus1=b[1], length=sum(n.links.loc[[i for _, i in l], 'length'].mean() for l in links), p_nom=min(n.links.loc[[i for _, i in l], 'p_nom'].sum() for l in links), - p_max_pu=s_max_pu, - p_min_pu=-s_max_pu, + p_max_pu=p_max_pu, + p_min_pu=-p_max_pu, underground=False, under_construction=False )