Skip to content
Snippets Groups Projects
Commit 168d057a authored by Markus Holzer's avatar Markus Holzer
Browse files

Merge branch 'cumulants_patch' into 'master'

Cumulant LBM Minor Fixes

See merge request pycodegen/lbmpy!90
parents 9fcdd0d9 9e9b0a1d
Branches
Tags
1 merge request!90Cumulant LBM Minor Fixes
Pipeline #33030 passed with stages
in 30 minutes and 5 seconds
This diff is collapsed.
......@@ -201,7 +201,7 @@ from lbmpy.fluctuatinglb import add_fluctuations_to_collision_rule
from lbmpy.methods import (create_mrt_orthogonal, create_mrt_raw, create_srt, create_trt, create_trt_kbc)
from lbmpy.methods.abstractlbmethod import RelaxationInfo
from lbmpy.methods.centeredcumulant import CenteredCumulantBasedLbMethod
from lbmpy.methods.momentbased.moment_transforms import FastCentralMomentTransform
from lbmpy.methods.momentbased.moment_transforms import PdfsToCentralMomentsByShiftMatrix
from lbmpy.methods.centeredcumulant.cumulant_transform import CentralMomentsToCumulantsByGeneratingFunc
from lbmpy.methods.creationfunctions import (
create_with_monomial_cumulants, create_with_polynomial_cumulants, create_with_default_polynomial_cumulants)
......@@ -579,7 +579,7 @@ def update_with_default_parameters(params, opt_params=None, fail_on_unknown_para
'initial_velocity': None,
'galilean_correction': False, # only available for D3Q27 cumulant methods
'central_moment_transform_class': FastCentralMomentTransform,
'central_moment_transform_class': PdfsToCentralMomentsByShiftMatrix,
'cumulant_transform_class': CentralMomentsToCumulantsByGeneratingFunc,
'entropic': False,
......
......@@ -27,7 +27,7 @@ from lbmpy.methods.centeredcumulant.cumulant_transform import (
from lbmpy.methods.momentbased.moment_transforms import (
PRE_COLLISION_CENTRAL_MOMENT, POST_COLLISION_CENTRAL_MOMENT,
FastCentralMomentTransform)
PdfsToCentralMomentsByShiftMatrix)
from lbmpy.methods.centeredcumulant.force_model import CenteredCumulantForceModel
from lbmpy.methods.centeredcumulant.galilean_correction import (
......@@ -139,7 +139,7 @@ class CenteredCumulantBasedLbMethod(AbstractLbMethod):
def __init__(self, stencil, cumulant_to_relaxation_info_dict, conserved_quantity_computation, force_model=None,
galilean_correction=False,
central_moment_transform_class=FastCentralMomentTransform,
central_moment_transform_class=PdfsToCentralMomentsByShiftMatrix,
cumulant_transform_class=CentralMomentsToCumulantsByGeneratingFunc):
assert isinstance(conserved_quantity_computation,
AbstractConservedQuantityComputation)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment