generalize solve_network

* skip_iterating flag: solve network only once without updating impedances
* extra_functionality parameter: add function to modify pyomo model
* extra_functionality args: function arguments for extra_functionality
* extra_postprocessing: add function for postprocessing steps depending on n.model
This commit is contained in:
Fabian Neumann 2019-06-18 13:24:29 +02:00
parent 4820588d6b
commit dc1feadcba

View File

@ -120,7 +120,10 @@ def fix_branches(n, lines_s_nom=None, links_p_nom=None):
if isinstance(n.opt, pypsa.opf.PersistentSolver): if isinstance(n.opt, pypsa.opf.PersistentSolver):
n.opt.update_var(n.model.link_p_nom) n.opt.update_var(n.model.link_p_nom)
def solve_network(n, config=None, solver_log=None, opts=None, callback=None): def solve_network(n, config=None, solver_log=None, opts=None, callback=None,
skip_iterating=False,
extra_functionality=None, extra_functionality_args=None,
extra_postprocessing=None):
if config is None: if config is None:
config = snakemake.config['solving'] config = snakemake.config['solving']
solve_opts = config['options'] solve_opts = config['options']
@ -130,7 +133,9 @@ def solve_network(n, config=None, solver_log=None, opts=None, callback=None):
solver_log = snakemake.log.solver solver_log = snakemake.log.solver
solver_name = solver_options.pop('name') solver_name = solver_options.pop('name')
def extra_postprocessing(n, snapshots, duals): if extra_postprocessing is None:
def get_line_limit_duals(n, snapshots, duals):
if hasattr(n, 'line_volume_limit') and hasattr(n.model, 'line_volume_constraint'): if hasattr(n, 'line_volume_limit') and hasattr(n.model, 'line_volume_constraint'):
cdata = pd.Series(list(n.model.line_volume_constraint.values()), cdata = pd.Series(list(n.model.line_volume_constraint.values()),
index=list(n.model.line_volume_constraint.keys())) index=list(n.model.line_volume_constraint.keys()))
@ -141,6 +146,8 @@ def solve_network(n, config=None, solver_log=None, opts=None, callback=None):
index=list(n.model.line_cost_constraint.keys())) index=list(n.model.line_cost_constraint.keys()))
n.line_cost_limit_dual = -cdata.map(duals).sum() n.line_cost_limit_dual = -cdata.map(duals).sum()
extra_postprocessing = get_line_limit_duals
def run_lopf(n, allow_warning_status=False, fix_ext_lines=False): def run_lopf(n, allow_warning_status=False, fix_ext_lines=False):
free_output_series_dataframes(n) free_output_series_dataframes(n)
@ -150,6 +157,9 @@ def solve_network(n, config=None, solver_log=None, opts=None, callback=None):
add_lv_constraint(n) add_lv_constraint(n)
add_lc_constraint(n) add_lc_constraint(n)
if extra_functionality is not None:
extra_functionality(n, *extra_functionality_args)
pypsa.opf.network_lopf_prepare_solver(n, solver_name=solver_name) pypsa.opf.network_lopf_prepare_solver(n, solver_name=solver_name)
if fix_ext_lines: if fix_ext_lines:
@ -176,6 +186,7 @@ def solve_network(n, config=None, solver_log=None, opts=None, callback=None):
return status, termination_condition return status, termination_condition
if not skip_iterating:
iteration = 0 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():
@ -240,6 +251,8 @@ def solve_network(n, config=None, solver_log=None, opts=None, callback=None):
iteration += 1 iteration += 1
status, termination_condition = run_lopf(n, fix_ext_lines=True) status, termination_condition = run_lopf(n, fix_ext_lines=True)
else:
status, termination_condition = run_lopf(n, fix_ext_lines=False)
if callback is not None: callback(n, iteration, status) if callback is not None: callback(n, iteration, status)
return n return n