topposite sign on viscous term - 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 92a11f510474e7d00cb4437cb5d8d207ab06d974
(DIR) parent 35b9d27b4dc7e82477a881d891b4eaf9ae572b70
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Fri, 20 Jun 2014 09:30:40 +0200
opposite sign on viscous term
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@@ -52,7 +52,7 @@ __device__ Float contactLinear_wall(Float3* F, Float3* T, Float* es_dot,
//Float3 f_n = (-devC_params.k_n * delta - devC_params.gamma_wn * vel_n) * n;
//Float3 f_n = (-devC_params.k_n * delta + devC_params.gamma_wn * vel_n) * n;
Float3 f_n = fmax(0.0, -devC_params.k_n*delta
- - devC_params.gamma_wn*vel_n) * n;
+ + devC_params.gamma_wn*vel_n) * n;
// Print data for contact model validation
/*printf("f_n_elast = %f\tgamma_wn = %f\tf_n_visc = %f\n",