From 543bb957591e013020456e10dbee72bd722ac074 Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 10 Feb 2020 16:47:11 +0100 Subject: [PATCH] small fix for solve_operations_network --- scripts/solve_network.py | 12 +++++------- scripts/solve_operations_network.py | 7 ++++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index a7113176..77eb4513 100755 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -210,18 +210,16 @@ def extra_functionality(n, snapshots): add_battery_constraints(n) -def solve_network(n, config=None, solver_log=None, opts=None, **kwargs): - solve_opts = snakemake.config['solving']['options'] +def solve_network(n, config, solver_log=None, opts='', **kwargs): solver_options = config['solving']['solver'].copy() solver_name = solver_options.pop('name') - skip_iterating = solve_opts.get('skip_iterating', False) - track_iterations = solve_opts.get('track_iterations', False) - + track_iterations = config['solving']['options'].get('track_iterations', False) + # add to network for extra_functionality n.config = config n.opts = opts - - if skip_iterating: + + if config['solving']['options'].get('skip_iterating', False): network_lopf(n, solver_name=solver_name, solver_options=solver_options, extra_functionality=extra_functionality, **kwargs) else: diff --git a/scripts/solve_operations_network.py b/scripts/solve_operations_network.py index 4b4c3e43..b9b2f866 100644 --- a/scripts/solve_operations_network.py +++ b/scripts/solve_operations_network.py @@ -100,13 +100,14 @@ if __name__ == "__main__": n = set_parameters_from_optimized(n, n_optim) del n_optim + config = snakemake.config opts = snakemake.wildcards.opts.split('-') + config['solving']['options']['skip_iterating'] = False with memory_logger(filename=getattr(snakemake.log, 'memory', None), interval=30.) as mem: n = prepare_network(n, solve_opts=snakemake.config['solving']['options']) - n = solve_network(n, config=snakemake.config, solver_dir=tmpdir, - solver_log=snakemake.log.solver, opts=opts, - skip_iterating=True) + n = solve_network(n, config, solver_dir=tmpdir, + solver_log=snakemake.log.solver, opts=opts) n.export_to_netcdf(snakemake.output[0]) logger.info("Maximum memory usage: {}".format(mem.mem_usage))