Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
lbmpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pycodegen
lbmpy
Commits
544b7055
Commit
544b7055
authored
2 months ago
by
Philipp Suffa
Browse files
Options
Downloads
Patches
Plain Diff
flake8 fixes
parent
3470d0a7
No related branches found
No related tags found
1 merge request
!187
Optmizations for kernel generation for the partially saturated cells method
Pipeline
#78131
passed
2 months ago
Stage: pretest
Stage: test
Stage: docs
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/lbmpy/creationfunctions.py
+2
-1
2 additions, 1 deletion
src/lbmpy/creationfunctions.py
src/lbmpy/partially_saturated_cells.py
+13
-23
13 additions, 23 deletions
src/lbmpy/partially_saturated_cells.py
with
15 additions
and
24 deletions
src/lbmpy/creationfunctions.py
+
2
−
1
View file @
544b7055
...
...
@@ -67,7 +67,8 @@ from lbmpy.enums import Stencil, Method, ForceModel, CollisionSpace, SubgridScal
import
lbmpy.forcemodels
as
forcemodels
from
lbmpy.fieldaccess
import
CollideOnlyInplaceAccessor
,
PdfFieldAccessor
,
PeriodicTwoFieldsAccessor
from
lbmpy.fluctuatinglb
import
add_fluctuations_to_collision_rule
from
lbmpy.partially_saturated_cells
import
(
replace_by_psm_collision_rule
,
PSMConfig
,
add_psm_solid_collision_to_collision_rule
)
from
lbmpy.partially_saturated_cells
import
(
replace_by_psm_collision_rule
,
PSMConfig
,
add_psm_solid_collision_to_collision_rule
)
from
lbmpy.non_newtonian_models
import
add_cassons_model
,
CassonsParameters
from
lbmpy.methods
import
(
create_mrt_orthogonal
,
create_mrt_raw
,
create_central_moment
,
create_srt
,
create_trt
,
create_trt_kbc
)
...
...
This diff is collapsed.
Click to expand it.
src/lbmpy/partially_saturated_cells.py
+
13
−
23
View file @
544b7055
...
...
@@ -53,7 +53,7 @@ def get_psm_solid_collision_term(collision_rule, psm_config, particle_per_cell_c
equilibrium_fluid
=
method
.
get_equilibrium_terms
()
equilibrium_solid
=
[]
#get equilibrium form object velocity
#
get equilibrium form object velocity
for
eq
in
equilibrium_fluid
:
eq_sol
=
eq
for
i
in
range
(
stencil
.
D
):
...
...
@@ -66,26 +66,17 @@ def get_psm_solid_collision_term(collision_rule, psm_config, particle_per_cell_c
zip
(
equilibrium_fluid
,
equilibrium_solid
,
pre_collision_pdf_symbols
,
stencil
)):
inverse_direction_index
=
stencil
.
stencil_entries
.
index
(
stencil
.
inverse_stencil_entries
[
i
])
if
psm_config
.
solid_collision
==
1
:
solid_collision
=
fraction_field
.
center
(
particle_per_cell_counter
)
*
(
(
pre_collision_pdf_symbols
[
inverse_direction_index
]
-
equilibrium_fluid
[
inverse_direction_index
]
)
-
(
f
-
eqSolid
)
)
solid_collision
=
(
fraction_field
.
center
(
particle_per_cell_counter
)
*
((
pre_collision_pdf_symbols
[
inverse_direction_index
]
-
equilibrium_fluid
[
inverse_direction_index
])
-
(
f
-
eqSolid
)))
elif
psm_config
.
solid_collision
==
2
:
# TODO get relaxation rate vector from method and use the right relaxation rate [i]
solid_collision
=
fraction_field
.
center
(
particle_per_cell_counter
)
*
(
(
eqSolid
-
f
)
+
(
1.0
-
method
.
relaxation_rates
[
0
])
*
(
f
-
eqFluid
)
)
solid_collision
=
(
fraction_field
.
center
(
particle_per_cell_counter
)
*
((
eqSolid
-
f
)
+
(
1.0
-
method
.
relaxation_rates
[
0
])
*
(
f
-
eqFluid
)))
elif
psm_config
.
solid_collision
==
3
:
solid_collision
=
fraction_field
.
center
(
particle_per_cell_counter
)
*
(
(
pre_collision_pdf_symbols
[
inverse_direction_index
]
-
equilibrium_solid
[
inverse_direction_index
]
)
-
(
f
-
eqSolid
)
)
solid_collision
=
(
fraction_field
.
center
(
particle_per_cell_counter
)
*
((
pre_collision_pdf_symbols
[
inverse_direction_index
]
-
equilibrium_solid
[
inverse_direction_index
])
-
(
f
-
eqSolid
)))
else
:
raise
ValueError
(
"
Only sc=1, sc=2 and sc=3 are supported.
"
)
...
...
@@ -101,11 +92,9 @@ def get_psm_force_from_solid_collision(solid_collisions, stencil, object_force_f
for
sc
,
offset
in
zip
(
solid_collisions
,
stencil
):
forces_rhs
-=
sc
*
int
(
offset
[
d
])
force_assignments
.
append
(
Assignment
(
object_force_field
.
center
(
particle_per_cell_counter
*
stencil
.
D
+
d
),
forces_rhs
force_assignments
.
append
(
Assignment
(
object_force_field
.
center
(
particle_per_cell_counter
*
stencil
.
D
+
d
),
forces_rhs
))
return
AssignmentCollection
(
force_assignments
)
...
...
@@ -138,7 +127,8 @@ def replace_by_psm_collision_rule(collision_rule, psm_config):
solid_collisions
[
p
]
=
get_psm_solid_collision_term
(
collision_rule
,
psm_config
,
p
)
if
psm_config
.
object_force_field
is
not
None
:
collision_assignments
+=
get_psm_force_from_solid_collision
(
solid_collisions
[
p
],
method
.
stencil
,
psm_config
.
object_force_field
,
p
)
collision_assignments
+=
get_psm_force_from_solid_collision
(
solid_collisions
[
p
],
method
.
stencil
,
psm_config
.
object_force_field
,
p
)
for
i
,
main
in
enumerate
(
collision_rule
.
main_assignments
):
rhs
=
main
.
rhs
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment