From 4d99780f6d88fa8e278541af4239986c1c48f823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6rsch?= Date: Mon, 3 Sep 2018 23:46:57 +0200 Subject: [PATCH] simplify_network: Carry underwater_fraction through simplification steps --- scripts/simplify_network.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/simplify_network.py b/scripts/simplify_network.py index 549824bc..2a6116a5 100644 --- a/scripts/simplify_network.py +++ b/scripts/simplify_network.py @@ -141,13 +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, [])] - name = n.links.loc[all_links, 'length'].idxmax() + '+{}'.format(len(links) - 1) p_max_pu = snakemake.config['links'].get('p_max_pu', 1.) + lengths = n.links.loc[all_links, 'length'] + name = lengths.idxmax() + '+{}'.format(len(links) - 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), + underwater_fraction=sum(lengths/lengths.sum() * n.links.loc[all_links, 'underwater_fraction']), p_max_pu=p_max_pu, p_min_pu=-p_max_pu, underground=False,