tfixed type - sphere - GPU-based 3D discrete element method algorithm with opti… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 6f6af460c13b37e4155f9a87cb5f1838f94e89f8 | |
parent acfb51a80f5db56f5fd790c3265c105a9f7a506b | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 19 Jun 2014 10:20:45 +0200 | |
fixed type | |
Diffstat: | |
M src/contactmodels.cuh | 5 ++--- | |
1 file changed, 2 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/src/contactmodels.cuh b/src/contactmodels.cuh | |
t@@ -206,9 +206,8 @@ __device__ void contactLinearViscous(Float3* F, Float3* T, | |
//f_n = -devC_params.k_n * delta_ab * n_ab; | |
// Normal force component: Elastic - viscous damping | |
- f_n = fmax(0.0, | |
- (-devC_params.k_n * delta_ab | |
- - devC_params.gamma_n * vel_n_ab) * n_ab); | |
+ f_n = fmax(0.0, -devC_params.k_n * delta_ab | |
+ - devC_params.gamma_n * vel_n_ab)) * n_ab; | |
// Make sure the viscous damping doesn't exceed the elastic component, | |
// i.e. the damping factor doesn't exceed the critical damping, 2*sqrt(m*k… |