tdont use rotational force in normal velocity - sphere - GPU-based 3D discrete … | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 64e194a6c52ee909e414d69c73567254683d0544 | |
parent 92a11f510474e7d00cb4437cb5d8d207ab06d974 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 20 Jun 2014 09:35:02 +0200 | |
dont use rotational force in normal velocity | |
Diffstat: | |
M src/contactmodels.cuh | 5 +++-- | |
1 file changed, 3 insertions(+), 2 deletions(-) | |
--- | |
diff --git a/src/contactmodels.cuh b/src/contactmodels.cuh | |
t@@ -37,7 +37,8 @@ __device__ Float contactLinear_wall(Float3* F, Float3* T, Fl… | |
// Normal component of the contact velocity | |
//Float vel_n = dot(vel, n); | |
- Float vel_n = -dot(vel, n); | |
+ //Float vel_n = -dot(vel, n); | |
+ Float vel_n = dot(vel_linear, n); | |
// The tangential velocity is the contact velocity | |
// with the normal component subtracted | |
t@@ -52,7 +53,7 @@ __device__ Float contactLinear_wall(Float3* F, Float3* T, Fl… | |
//Float3 f_n = (-devC_params.k_n * delta - devC_params.gamma_wn * vel_n) *… | |
//Float3 f_n = (-devC_params.k_n * delta + devC_params.gamma_wn * vel_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", |