Skip to content
Snippets Groups Projects

Rework of the Cumulant-Based Method

Merged Frederik Hennig requested to merge da15siwa/lbmpy:cumulant_method_rework into master
All threads resolved!
Viewing commit 0373ee37
Show latest version
1 file
+ 4
4
Preferences
Compare changes
@@ -12,8 +12,8 @@ from lbmpy.methods.momentbased.momentbasedsimplifications import (
@@ -12,8 +12,8 @@ from lbmpy.methods.momentbased.momentbasedsimplifications import (
insert_half_force, insert_conserved_quantity_products)
insert_half_force, insert_conserved_quantity_products)
from pystencils.simp import (
from pystencils.simp import (
SimplificationStrategy, add_subexpressions_for_divisions, apply_to_all_assignments,
SimplificationStrategy, add_subexpressions_for_divisions, apply_to_all_assignments,
subexpression_substitution_in_main_assignments, insert_aliases, insert_constants,
subexpression_substitution_in_main_assignments, insert_aliases, insert_constants)
add_subexpressions_for_constants)
# add_subexpressions_for_constants)
def create_simplification_strategy(lb_method, split_inner_loop=False):
def create_simplification_strategy(lb_method, split_inner_loop=False):
@@ -73,7 +73,7 @@ def _moment_space_simplification(split_inner_loop):
@@ -73,7 +73,7 @@ def _moment_space_simplification(split_inner_loop):
s.add(insert_half_force)
s.add(insert_half_force)
s.add(insert_aliases)
s.add(insert_aliases)
s.add(add_subexpressions_for_divisions)
s.add(add_subexpressions_for_divisions)
#s.add(add_subexpressions_for_constants)
# s.add(add_subexpressions_for_constants)
if split_inner_loop:
if split_inner_loop:
s.add(create_lbm_split_groups)
s.add(create_lbm_split_groups)
s.add(lambda ac: ac.new_without_unused_subexpressions())
s.add(lambda ac: ac.new_without_unused_subexpressions())
@@ -90,7 +90,7 @@ def _cumulant_space_simplification(split_inner_loop):
@@ -90,7 +90,7 @@ def _cumulant_space_simplification(split_inner_loop):
s.add(insert_aliases)
s.add(insert_aliases)
s.add(insert_constants)
s.add(insert_constants)
s.add(add_subexpressions_for_divisions)
s.add(add_subexpressions_for_divisions)
#s.add(add_subexpressions_for_constants)
# s.add(add_subexpressions_for_constants)
if split_inner_loop:
if split_inner_loop:
s.add(create_lbm_split_groups)
s.add(create_lbm_split_groups)
s.add(lambda ac: ac.new_without_unused_subexpressions())
s.add(lambda ac: ac.new_without_unused_subexpressions())