From 81bcf2aad2e0792ff7b8ef808af72d1176c5a7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6rsch?= Date: Tue, 13 Mar 2018 10:48:45 +0100 Subject: [PATCH] Properly set s_nom on lines --- scripts/base_network.py | 4 ++++ scripts/simplify_network.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/base_network.py b/scripts/base_network.py index b79115fd..bb8d0dde 100644 --- a/scripts/base_network.py +++ b/scripts/base_network.py @@ -119,6 +119,10 @@ def _set_electrical_parameters_lines(lines): lines['s_max_pu'] = snakemake.config['lines']['s_max_pu'] lines.loc[lines.under_construction.astype(bool), 'num_parallel'] = 0. + lines['s_nom'] = ( + np.sqrt(3) * n.lines['type'].map(n.line_types.i_nom) * + n.lines.bus0.map(n.buses.v_nom) * n.lines.num_parallel + ) return lines diff --git a/scripts/simplify_network.py b/scripts/simplify_network.py index 3f0dc622..a5300690 100644 --- a/scripts/simplify_network.py +++ b/scripts/simplify_network.py @@ -38,6 +38,10 @@ def simplify_network_to_380(n): n.lines.loc[lines_v_nom_b, 'num_parallel'] *= (n.lines.loc[lines_v_nom_b, 'v_nom'] / 380.)**2 n.lines.loc[lines_v_nom_b, 'v_nom'] = 380. n.lines.loc[lines_v_nom_b, 'type'] = linetype_380 + n.lines.loc[lines_v_nom_b, 's_nom'] = ( + np.sqrt(3) * n.lines['type'].map(n.line_types.i_nom) * + n.lines.bus0.map(n.buses.v_nom) * n.lines.num_parallel + ) # Replace transformers by lines trafo_map = pd.Series(n.transformers.bus1.values, index=n.transformers.bus0.values)