diff --git a/.flake8 b/.flake8 index caa78d2172e3a1255d51292fa78e008279c5fcff..e642613bfa23f30a1302cae51894a668b4ca66f4 100644 --- a/.flake8 +++ b/.flake8 @@ -2,4 +2,4 @@ max-line-length=120 exclude=lbmpy/plot.py lbmpy/session.py -ignore = W293 W503 W291 +ignore = W293 W503 W291 E741 diff --git a/lbmpy/creationfunctions.py b/lbmpy/creationfunctions.py index b60e35a0771089c3a30e99c8a7aa92e88c675c33..dfdd5c4c2c5dbd246d24a112a52089f3c4f4909e 100644 --- a/lbmpy/creationfunctions.py +++ b/lbmpy/creationfunctions.py @@ -322,6 +322,11 @@ def create_lb_collision_rule(lb_method=None, optimization={}, **kwargs): else: collision_rule = lb_method.get_collision_rule(keep_rrs_symbolic=keep_rrs_symbolic) + if params['output'] and params['kernel_type'] == 'stream_pull_collide': + cqc = lb_method.conserved_quantity_computation + output_eqs = cqc.output_equations_from_pdfs(lb_method.pre_collision_pdf_symbols, params['output']) + collision_rule = collision_rule.new_merged(output_eqs) + if opt_params['simplification'] == 'auto': simplification = create_simplification_strategy(lb_method, split_inner_loop=split_inner_loop) else: @@ -358,11 +363,6 @@ def create_lb_collision_rule(lb_method=None, optimization={}, **kwargs): if cse_global: collision_rule = sympy_cse(collision_rule) - if params['output'] and params['kernel_type'] == 'stream_pull_collide': - cqc = lb_method.conserved_quantity_computation - output_eqs = cqc.output_equations_from_pdfs(lb_method.pre_collision_pdf_symbols, params['output']) - collision_rule = collision_rule.new_merged(output_eqs) - return collision_rule