tnorm of vel_t - sphere - GPU-based 3D discrete element method algorithm with o… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit b97cceb94ea37bc77a59165f0d994708d8553ed1 | |
parent d5d09a59fa14e9a6b46f1a5712d782e76258c352 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 20 Jun 2014 13:21:51 +0200 | |
norm of vel_t | |
Diffstat: | |
M src/contactmodels.cuh | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
--- | |
diff --git a/src/contactmodels.cuh b/src/contactmodels.cuh | |
t@@ -449,7 +449,7 @@ __device__ void contactLinear(Float3* F, Float3* T, | |
+ devC_params.gamma_t * vel_t); | |
// Store energy dissipated in tangential viscous component | |
- *ev_dot += 0.5 * devC_params.gamma_t * vel_t * vel_t; | |
+ *ev_dot += 0.5 * devC_params.gamma_t * vel_t_length * vel_t_length; | |
// Shear friction heat production rate: | |
// The energy lost from the tangential spring is dissipated as heat |