From 016f04c3fc01415d28d60a9b8c58e6d096ec8d38 Mon Sep 17 00:00:00 2001
From: Rafael Ravedutti <rafaelravedutti@gmail.com>
Date: Sun, 17 Dec 2023 10:26:20 +0100
Subject: [PATCH] Update DEM kernel
Signed-off-by: Rafael Ravedutti <rafaelravedutti@gmail.com>
---
examples/dem.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/examples/dem.py b/examples/dem.py
index 60e889b..076660c 100644
--- a/examples/dem.py
+++ b/examples/dem.py
@@ -59,12 +59,10 @@ def linear_spring_dashpot(i, j):
cond2 = sticking == 1 and fTLS_len < f_friction_abs_dynamic
f_friction_abs = select(cond1, f_friction_abs_static, f_friction_abs_dynamic)
n_sticking = select(cond1 or cond2 or fTLS_len < f_friction_abs_dynamic, 1, 0)
-
- if not cond1 and not cond2 and stiffness_tan > 0.0:
- tangential_spring_displacement[i, j] = (f_friction_abs * t - damping_tan * rel_vel_t) / stiffness_tan
-
- else:
- tangential_spring_displacement[i, j] = new_tan_spring_disp
+ tangential_spring_displacement[i, j] = \
+ select(not cond1 and not cond2 and stiffness_tan > 0.0,
+ (f_friction_abs * t - damping_tan * rel_vel_t) / stiffness_tan,
+ new_tan_spring_disp)
impact_velocity_magnitude[i, j] = impact_magnitude
is_sticking[i, j] = n_sticking
@@ -181,7 +179,7 @@ psim.setup(update_mass_and_inertia, {'densityParticle_SI': densityParticle_SI,
#psim.compute_half()
psim.build_cell_lists(linkedCellWidth)
-psim.vtk_output(f"output/dem_{target}", frequency=visSpacing)
+#psim.vtk_output(f"output/dem_{target}", frequency=visSpacing)
psim.compute(gravity,
symbols={'densityParticle_SI': densityParticle_SI,
--
GitLab