Commit 96f0b092 authored by Frédéric Dubois's avatar Frédéric Dubois
Browse files

bug fix

parent 2e98ea83
Pipeline #9261 passed with stages
in 3 minutes and 54 seconds
......@@ -730,8 +730,8 @@ def scontactTolmgc90(dirname, dim, it=0, fric = 0., assume_box=False):
nbl=seg.shape[0]
for i in range(nbl) :
x0 = np.array(seg[i][3][0])
x1 = np.array(seg[i][3][1])
x0 = np.array(seg[i][2][0])
x1 = np.array(seg[i][2][1])
tag = 'xxxxx'
tag += "_" * (5 - len(tag))
bndtags.add(tag)
......@@ -739,7 +739,7 @@ def scontactTolmgc90(dirname, dim, it=0, fric = 0., assume_box=False):
l=np.linalg.norm(x0 - x1)
t/=l
n = np.array([-t[1], t[0]]) * l * 1e-1
vs = np.array([x0-2*n, x0, x1, x1 -2*n])
vs = np.array([x0, x0+2*n, x1+2*n, x1])
av = pre.rigidPolygon(model,mater,np.zeros([2]),color=tag,generation_type="full",vertices=vs)
av.imposeDrivenDof(component=[1,2,3],dofty='vlocy')
avs.addAvatar(av)
......
......@@ -100,10 +100,12 @@ def predictor_corrector_iterate(fluid, particles, dt, min_nsub=1, contact_tol=1e
# Copy the solid solution of the previous time step before computing the prediction
x0 = np.copy(particles.position())
cp0 = np.copy(particles.contact_forces())
seg0 = np.copy(particles.segments())
disk0 = np.copy(particles.disks())
if particles.dim() == 3 :
tri0 = np.copy(particles.triangles())
# seg0 = np.copy(particles.segments())
# disk0 = np.copy(particles.disks())
# if particles.dim() == 3 :
# tri0 = np.copy(particles.triangles())
# Predictor
#
# Compute the fluid solution and keep a copy of this solution and the forces applied by the fluid on the grains
......
Markdown is supported
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