small fix for solve_operations_network
This commit is contained in:
parent
1ecca802f3
commit
543bb95759
@ -210,18 +210,16 @@ def extra_functionality(n, snapshots):
|
|||||||
add_battery_constraints(n)
|
add_battery_constraints(n)
|
||||||
|
|
||||||
|
|
||||||
def solve_network(n, config=None, solver_log=None, opts=None, **kwargs):
|
def solve_network(n, config, solver_log=None, opts='', **kwargs):
|
||||||
solve_opts = snakemake.config['solving']['options']
|
|
||||||
solver_options = config['solving']['solver'].copy()
|
solver_options = config['solving']['solver'].copy()
|
||||||
solver_name = solver_options.pop('name')
|
solver_name = solver_options.pop('name')
|
||||||
skip_iterating = solve_opts.get('skip_iterating', False)
|
track_iterations = config['solving']['options'].get('track_iterations', False)
|
||||||
track_iterations = solve_opts.get('track_iterations', False)
|
|
||||||
|
|
||||||
# add to network for extra_functionality
|
# add to network for extra_functionality
|
||||||
n.config = config
|
n.config = config
|
||||||
n.opts = opts
|
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,
|
network_lopf(n, solver_name=solver_name, solver_options=solver_options,
|
||||||
extra_functionality=extra_functionality, **kwargs)
|
extra_functionality=extra_functionality, **kwargs)
|
||||||
else:
|
else:
|
||||||
|
@ -100,13 +100,14 @@ if __name__ == "__main__":
|
|||||||
n = set_parameters_from_optimized(n, n_optim)
|
n = set_parameters_from_optimized(n, n_optim)
|
||||||
del n_optim
|
del n_optim
|
||||||
|
|
||||||
|
config = snakemake.config
|
||||||
opts = snakemake.wildcards.opts.split('-')
|
opts = snakemake.wildcards.opts.split('-')
|
||||||
|
config['solving']['options']['skip_iterating'] = False
|
||||||
|
|
||||||
with memory_logger(filename=getattr(snakemake.log, 'memory', None), interval=30.) as mem:
|
with memory_logger(filename=getattr(snakemake.log, 'memory', None), interval=30.) as mem:
|
||||||
n = prepare_network(n, solve_opts=snakemake.config['solving']['options'])
|
n = prepare_network(n, solve_opts=snakemake.config['solving']['options'])
|
||||||
n = solve_network(n, config=snakemake.config, solver_dir=tmpdir,
|
n = solve_network(n, config, solver_dir=tmpdir,
|
||||||
solver_log=snakemake.log.solver, opts=opts,
|
solver_log=snakemake.log.solver, opts=opts)
|
||||||
skip_iterating=True)
|
|
||||||
n.export_to_netcdf(snakemake.output[0])
|
n.export_to_netcdf(snakemake.output[0])
|
||||||
|
|
||||||
logger.info("Maximum memory usage: {}".format(mem.mem_usage))
|
logger.info("Maximum memory usage: {}".format(mem.mem_usage))
|
||||||
|
Loading…
Reference in New Issue
Block a user