tDot product for finding path along force - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
(HTM) git clone git://src.adamsgaard.dk/sphere
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit a6c68eb862e5d1c07ac66791537b3ad8b6a139f6
(DIR) parent 8f77eaf4a0ec03724a4555b4b44d0291194a237d
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Tue, 9 Oct 2012 14:02:10 +0200
Dot product for finding path along force
Diffstat:
M src/contactmodels.cuh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
(DIR) diff --git a/src/contactmodels.cuh b/src/contactmodels.cuh
t@@ -386,7 +386,7 @@ __device__ void contactLinear(Float3* F, Float3* T,
// The energy lost from the tangential spring is dissipated as heat
//*es_dot += -dot(vel_t_ab, f_t);
//*es_dot += length(delta_t0 - delta_t) * devC_k_t / devC_dt; // Seen in EsyS-Particle
- *es_dot += length(delta_t0 - delta_t) * length(f_t) / devC_dt;
+ *es_dot += fabs(dot(delta_t0 - delta_t, f_t)) / devC_dt;
} else { // Static case