From 74e89590b91b643bb1c36ceec55fd7c0149fb3e7 Mon Sep 17 00:00:00 2001
From: markus <markus.holzer@fau.de>
Date: Sun, 21 Jun 2020 16:54:48 +0200
Subject: [PATCH] Fix missing dict argument when split is used in combination
with output fields
---
lbmpy/creationfunctions.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lbmpy/creationfunctions.py b/lbmpy/creationfunctions.py
index b60e35a0..dfdd5c4c 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
--
GitLab