Commit 678bdce2 authored by Nathan Coppin's avatar Nathan Coppin
Browse files

forget to assess for friction

parent 73dd6e9c
Pipeline #7922 passed with stages
in 3 minutes and 10 seconds
......@@ -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())
......
Supports Markdown
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