tFixed typo - 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 4dd89e58624d87a3e21691a162156b300334af33
(DIR) parent e13db0e693ca0fcddcdf072a561c99e01fc74f6e
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Wed, 31 Oct 2012 08:59:03 +0100
Fixed typo
Diffstat:
M src/contactmodels.cuh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
(DIR) diff --git a/src/contactmodels.cuh b/src/contactmodels.cuh
t@@ -66,9 +66,9 @@ __device__ Float contactLinear_wall(Float3* F, Float3* T, Float* es_dot,
// Determine max. friction
Float f_t_limit;
if (vel_t_length > 0.001f) { // Dynamic
- f_t_limit = devC_params.mu_rd * f_n_length;
+ f_t_limit = devC_params.mu_wd * f_n_length;
} else { // Static
- f_t_limit = devC_params.mu_rs * f_n_length;
+ f_t_limit = devC_params.mu_ws * f_n_length;
}
// If the shear force component exceeds the friction,