 |
tadd CFDDEMCOUPLING flag - sphere - GPU-based 3D discrete element method algori… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 8546efe646857ae1bf86e1a0d6236663d5e2891f |
|
parent 14de16aab8f24ea778aba99898873a5dc600bddd |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Tue, 22 Apr 2014 11:08:39 +0200 |
|
|
|
add CFDDEMCOUPLING flag |
|
|
|
Diffstat: |
|
M src/debug.h | 3 +++ |
|
M src/navierstokes.cuh | 4 ++-- |
|
|
|
2 files changed, 5 insertions(+), 2 deletions(-) |
|
--- |
|
diff --git a/src/debug.h b/src/debug.h |
|
t@@ -34,6 +34,9 @@ const int write_conv_log = 1; |
|
const int conv_log_interval = 10; |
|
//const int conv_log_interval = 1; |
|
|
|
+// Enable drag force and particle fluid coupling |
|
+#define CFDDEMCOUPLING |
|
+ |
|
// Check for nan/inf values in fluid solver kernels |
|
#define CHECK_NS_FINITE |
|
|
|
diff --git a/src/navierstokes.cuh b/src/navierstokes.cuh |
|
t@@ -2347,7 +2347,7 @@ __global__ void findInteractionForce( |
|
*v_rel_length/d_avg)*v_rel; |
|
} |
|
|
|
- if (v_rel_length > 1.0e-5) |
|
+ /*if (v_rel_length > 1.0e-5) |
|
printf("%d,%d,%d\tfi = %f,%f,%f" |
|
"\tphi = %f\td_avg = %f" |
|
"\tv_rel = %f,%f,%f\t" |
|
t@@ -2355,7 +2355,7 @@ __global__ void findInteractionForce( |
|
x,y,z, fi.x, fi.y, fi.z, |
|
phi, d_avg, |
|
v_rel.x, v_rel.y, v_rel.z, |
|
- re, cd); |
|
+ re, cd);*/ |
|
|
|
__syncthreads(); |
|
dev_ns_fi[cellidx] = fi; |
