tDot product for finding path along force - sphere - GPU-based 3D discrete elem… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit a6c68eb862e5d1c07ac66791537b3ad8b6a139f6 | |
parent 8f77eaf4a0ec03724a4555b4b44d0291194a237d | |
Author: Anders Damsgaard <[email protected]> | |
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(-) | |
--- | |
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… | |
- *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 | |