tremoved extra paranthesis - 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 3126bc3283216bf1288e04d95a53973c384d09f4
(DIR) parent 6f6af460c13b37e4155f9a87cb5f1838f94e89f8
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Thu, 19 Jun 2014 10:22:15 +0200
removed extra paranthesis
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@@ -207,7 +207,7 @@ __device__ void contactLinearViscous(Float3* F, Float3* T,
// 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;
+ - 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_n)