commit b640f26eebec4330354379ec734a996089ec7def
parent d67f4c7667ccc392ddf6943d38f976613f9f3fff
Author: Anders Damsgaard <andersd@riseup.net>
Date: Wed, 21 Feb 2018 09:07:36 -0500
Set contact age to zero if there is Coulomb slip
Diffstat:
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/interaction.jl b/src/interaction.jl
@@ -258,6 +258,7 @@ function interactGrains!(simulation::Simulation, i::Int, j::Int, ic::Int)
force_t = abs(γ_t * vel_t)
if force_t > μ_d_minimum*abs(force_n)
force_t = μ_d_minimum*abs(force_n)
+ simulation.grains[i].contact_age[ic] = -simulation.time_step
end
if vel_t > 0.
force_t = -force_t
@@ -270,6 +271,7 @@ function interactGrains!(simulation::Simulation, i::Int, j::Int, ic::Int)
if abs(force_t) > μ_d_minimum*abs(force_n)
force_t = μ_d_minimum*abs(force_n)*force_t/abs(force_t)
δ_t = (-force_t - γ_t*vel_t)/k_t
+ simulation.grains[i].contact_age[ic] = -simulation.time_step
end
else