bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixup! trace_solve_network: Save intermediate line capacities

Browse Source
This commit is contained in:
Jonas Hoersch 2019-02-06 11:46:33 +01:00
parent 2cf8f1374f
commit 8c9e650feb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster.yaml
View File

@ -7,6 +7,9 @@ feedin_preparation:
solve_network: solve_network:
walltime: "05:00:00:00" walltime: "05:00:00:00"
trace_solve_network:
walltime: "05:00:00:00"
solve: solve:
walltime: "05:00:00:00" walltime: "05:00:00:00"
threads: 4 # Group threads are not aggregated threads: 4 # Group threads are not aggregated

4
scripts/solve_network.py
View File

@ -176,6 +176,7 @@ def solve_network(n, config=None, solver_log=None, opts=None, callback=None):
return status, termination_condition return status, termination_condition
iteration = 0
lines_ext_b = n.lines.s_nom_extendable lines_ext_b = n.lines.s_nom_extendable
if lines_ext_b.any(): if lines_ext_b.any():
# puh: ok, we need to iterate, since there is a relation # puh: ok, we need to iterate, since there is a relation
@ -208,8 +209,7 @@ def solve_network(n, config=None, solver_log=None, opts=None, callback=None):
) )
logger.debug("lines.num_parallel={}".format(n.lines.loc[lines_ext_typed_b, 'num_parallel'])) logger.debug("lines.num_parallel={}".format(n.lines.loc[lines_ext_typed_b, 'num_parallel']))
iteration = 1 iteration += 1
lines['s_nom_opt'] = lines['s_nom'] * n.lines['num_parallel'].where(n.lines.type != '', 1.) lines['s_nom_opt'] = lines['s_nom'] * n.lines['num_parallel'].where(n.lines.type != '', 1.)
status, termination_condition = run_lopf(n, allow_warning_status=True) status, termination_condition = run_lopf(n, allow_warning_status=True)
if callback is not None: callback(n, iteration, status) if callback is not None: callback(n, iteration, status)