tvisual formatting - 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 9c4bbb242df9040699c0934abd157f5c4bcf0f6a
(DIR) parent 1cf2eade186b97fd59e4efc6c84519ebba7cc7ec
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Mon, 1 Sep 2014 13:24:54 +0200
visual formatting
Diffstat:
M src/cohesion.cuh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
(DIR) diff --git a/src/cohesion.cuh b/src/cohesion.cuh
t@@ -298,8 +298,8 @@ __device__ void capillaryCohesion2_exp(
else
r = radius_b/radius_a;
- const Float lambda = 0.9/1.4142135623730951 * pow(devC_params.V_b, 2.0) * pow(r, -0.5)
- * pow(1.0/radius_a + 1.0/radius_b, 0.5);
+ const Float lambda = 0.9/1.4142135623730951 * pow(devC_params.V_b, 2.0)
+ * pow(r, -0.5) * pow(1.0/radius_a + 1.0/radius_b, 0.5);
// Calculate cohesional force
const Float3 f_c =
t@@ -307,7 +307,6 @@ __device__ void capillaryCohesion2_exp(
// Add force components from this collision to total force for particle
*N += f_c;
-
}
#endif