tvarious fixes - 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 50228eb0459ae03ef1db607f6e160c98ad4ea81c
(DIR) parent 8ef27c9281201850da0bcc2095604dec0d743aac
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Fri, 20 Mar 2015 10:22:34 +0100
various fixes
Diffstat:
M src/darcy.cuh | 14 ++++++++------
M src/device.cu | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
---
(DIR) diff --git a/src/darcy.cuh b/src/darcy.cuh
t@@ -866,6 +866,11 @@ __global__ void findDarcyPressureGradient(
__syncthreads();
dev_darcy_grad_p[d_idx(x,y,z)] = grad_p;
+ /*printf("%d,%d,%d findDarcyPressureGradient:\n"
+ "\tgrad_p = %f, %f, %f\n",
+ x, y, z,
+ grad_p.x, grad_p.y, grad_p.z);*/
+
#ifdef CHECK_FLUID_FINITE
checkFiniteFloat3("grad_p", x, y, z, grad_p);
#endif
t@@ -877,7 +882,7 @@ __global__ void findDarcyPressureGradient(
// neglected. The buoyancy force is included.
__global__ void findDarcyPressureForceLinear(
const Float4* __restrict__ dev_x, // in
- const Float* __restrict__ dev_darcy_grad_p, // in
+ const Float3* __restrict__ dev_darcy_grad_p, // in
//const Float* __restrict__ dev_darcy_p, // in
//const Float* __restrict__ dev_darcy_phi, // in
const unsigned int wall0_iz, // in
t@@ -959,7 +964,7 @@ __global__ void findDarcyPressureForceLinear(
if (i_z >= wall0_iz)
f_p.z = 0.0;
- printf("%d,%d,%d findPF:\n"
+ /*printf("%d,%d,%d findPF:\n"
//"\tphi = %f\n"
"\tx = %f, %f, %f\n"
"\tX = %f, %f, %f\n"
t@@ -968,11 +973,8 @@ __global__ void findDarcyPressureForceLinear(
i_x, i_y, i_z,
x3.x, x3.y, x3.z,
X.x, X.y, X.z,
- X.x + n_xn.x, X.x + n_xp.x,
- X.y + n_yn.y, X.y + n_yp.y,
- X.z + n_zn.z, X.z + n_zp.z,
grad_p.x, grad_p.y, grad_p.z,
- f_p.x, f_p.y, f_p.z);
+ f_p.x, f_p.y, f_p.z);*/
#ifdef CHECK_FLUID_FINITE
checkFiniteFloat3("f_p", i_x, i_y, i_z, f_p);
(DIR) diff --git a/src/device.cu b/src/device.cu
t@@ -1836,7 +1836,7 @@ __host__ void DEM::startTime()
dev_darcy_f_p);*/
findDarcyPressureForceLinear<<<dimGrid, dimBlock>>>(
dev_x,
- dev_darcy_p,
+ dev_darcy_grad_p,
wall0_iz,
darcy.rho_f,
dev_force,