Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
pycodegen
lbmpy
Commits
168d057a
Commit
168d057a
authored
Jul 01, 2021
by
Markus Holzer
Browse files
Merge branch 'cumulants_patch' into 'master'
Cumulant LBM Minor Fixes See merge request
!90
parents
9fcdd0d9
9e9b0a1d
Pipeline
#33030
passed with stages
in 30 minutes and 5 seconds
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
doc/notebooks/04_tutorial_cumulant_LBM.ipynb
View file @
168d057a
This diff is collapsed.
Click to expand it.
lbmpy/creationfunctions.py
View file @
168d057a
...
...
@@ -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
Fast
CentralMoment
Transform
from
lbmpy.methods.momentbased.moment_transforms
import
PdfsTo
CentralMoment
sByShiftMatrix
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'
:
Fast
CentralMoment
Transform
,
'central_moment_transform_class'
:
PdfsTo
CentralMoment
sByShiftMatrix
,
'cumulant_transform_class'
:
CentralMomentsToCumulantsByGeneratingFunc
,
'entropic'
:
False
,
...
...
lbmpy/methods/centeredcumulant/centeredcumulantmethod.py
View file @
168d057a
...
...
@@ -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
,
Fast
CentralMoment
Transform
)
PdfsTo
CentralMoment
sByShiftMatrix
)
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
=
Fast
CentralMoment
Transform
,
central_moment_transform_class
=
PdfsTo
CentralMoment
sByShiftMatrix
,
cumulant_transform_class
=
CentralMomentsToCumulantsByGeneratingFunc
):
assert
isinstance
(
conserved_quantity_computation
,
AbstractConservedQuantityComputation
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment