Allow including lines and links which are still under construction

This commit is contained in:
Jonas Hörsch 2018-07-10 16:37:50 +02:00
parent b0993c8b52
commit 6d680a0262
2 changed files with 6 additions and 2 deletions

View File

@ -91,9 +91,11 @@ lines:
s_max_pu: 0.7
length_factor: 1.25
with_under_construction: false
links:
s_max_pu: 0.7
with_under_construction: false
transformers:
x: 0.1

View File

@ -120,7 +120,8 @@ def _set_electrical_parameters_lines(lines):
lines.loc[lines["v_nom"] == v_nom, 'type'] = linetypes[v_nom]
lines['s_max_pu'] = snakemake.config['lines']['s_max_pu']
lines.loc[lines.under_construction.astype(bool), 'num_parallel'] = 0.
if not snakemake.config['lines']['with_under_construction']:
lines.loc[lines.under_construction.astype(bool), 'num_parallel'] = 0.
return lines
@ -155,7 +156,8 @@ def _set_electrical_parameters_links(links):
p_nom = links_p_nom.dropna(subset=["j"]).set_index("j")["Power (MW)"]
links.loc[p_nom.index, "p_nom"] = p_nom
links.loc[links.under_construction.astype(bool), "p_nom"] = 0.
if not snakemake.config['links']['with_under_construction']:
links.loc[links.under_construction.astype(bool), "p_nom"] = 0.
return links