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
fluidparticles
MigFlow
Commits
678bdce2
Commit
678bdce2
authored
Jul 09, 2020
by
Nathan Coppin
Browse files
forget to assess for friction
parent
73dd6e9c
Pipeline
#7922
passed with stages
in 3 minutes and 10 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
python/time_integration.py
View file @
678bdce2
...
...
@@ -85,7 +85,8 @@ def predictor_corrector_iterate(fluid, particles, dt, min_nsub=1, contact_tol=1e
vp0
=
np
.
copy
(
particles
.
velocity
())
pp0
=
np
.
copy
(
particles
.
position
())
cp0
=
np
.
copy
(
particles
.
contact_forces
())
op0
=
np
.
copy
(
particles
.
omega
())
if
particles
.
_rotation_enabled
:
op0
=
np
.
copy
(
particles
.
omega
())
# Predictor
#
...
...
@@ -114,7 +115,8 @@ def predictor_corrector_iterate(fluid, particles, dt, min_nsub=1, contact_tol=1e
fluid
.
advance_concentration
(
dt
)
# Reset solid velocities
particles
.
velocity
()[:,:]
=
vp0
particles
.
omega
()[:,:]
=
op0
if
particles
.
_rotation_enabled
:
particles
.
omega
()[:,:]
=
op0
_advance_particles
(
particles
,(
alpha
*
f0
+
(
1
-
alpha
)
*
f1
),
dt
,
min_nsub
,
contact_tol
,
after_sub_iter
=
after_sub_iter
,
max_split
=
max_split
)
# Give to the fluid the solid information
fluid
.
set_particles
(
particles
.
mass
(),
particles
.
volume
(),
particles
.
position
(),
particles
.
velocity
(),
particles
.
contact_forces
())
...
...
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