twrong unit in pressure prediction - sphere - GPU-based 3D discrete element met… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit d4d46bfe646485d0011d5dd7d342995be9a6b076 | |
parent 3612eea4288909cbecd771feca55d1bd8ca89401 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 23 May 2014 10:46:46 +0200 | |
wrong unit in pressure prediction | |
Diffstat: | |
M src/debug.h | 4 ++-- | |
M src/navierstokes.cuh | 3 +-- | |
2 files changed, 3 insertions(+), 4 deletions(-) | |
--- | |
diff --git a/src/debug.h b/src/debug.h | |
t@@ -52,7 +52,7 @@ const int conv_log_interval = 10; | |
// simulation of particulate systems: Theoretical developments". | |
// SET_2 corresponds approximately to Model A in Zhu et al. 2007. | |
// Choose exactly one. | |
-#define SET_1 | |
-//#define SET_2 | |
+//#define SET_1 | |
+#define SET_2 | |
#endif | |
diff --git a/src/navierstokes.cuh b/src/navierstokes.cuh | |
t@@ -2071,7 +2071,6 @@ __global__ void findPredNSvelocities( | |
f_i = MAKE_FLOAT3(0.0, 0.0, 0.0); | |
const Float dt = ndem*devC_dt; | |
- const Float mu = devC_params.mu; | |
const Float rho = devC_params.rho_f; | |
// Find pressure gradient | |
t@@ -2107,7 +2106,7 @@ __global__ void findPredNSvelocities( | |
#ifdef SET_1 | |
Float3 v_p = v | |
+ pressure_term // pressure gradient | |
- - dt/(mu*phi)*f_i // particle fluid interaction | |
+ - dt/(rho*phi)*f_i // particle fluid interaction | |
+ dt/(rho*phi)*div_tau // diffusion | |
+ MAKE_FLOAT3(devC_params.g[0], devC_params.g[1], | |
devC_params.g[2])*dt // gravity |