tfix function and variable type - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
HTML git clone git://src.adamsgaard.dk/sphere
DIR Log
DIR Files
DIR Refs
DIR LICENSE
---
DIR commit 660e8f0c3984cffeee85f6c2f1b22615450a68e1
DIR parent 31cb03e32d6bc463635b897c1cdb815368c8a835
HTML Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 3 Jun 2014 16:25:32 +0200
fix function and variable type
Diffstat:
M src/navierstokes.cuh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
DIR diff --git a/src/navierstokes.cuh b/src/navierstokes.cuh
t@@ -2952,7 +2952,7 @@ __global__ void findInteractionForce(
const Float phi = dev_ns_phi[cellidx];
const Float v_x = dev_ns_v_x[vidx(i_x,i_y,i_z)];
- const Float v_x_p = dev_ns_v_x[vidx(i_x+1,y,i_z)];
+ const Float v_x_p = dev_ns_v_x[vidx(i_x+1,i_y,i_z)];
const Float v_y = dev_ns_v_x[vidx(i_x,i_y,i_z)];
const Float v_y_p = dev_ns_v_x[vidx(i_x,i_y+1,i_z)];
const Float v_z = dev_ns_v_x[vidx(i_x,i_y,i_z)];
t@@ -3193,9 +3193,9 @@ __global__ void interpolateCenterToFace(
const Float3 zn = dev_in[idx(x,y,z-1)];
const Float3 center = dev_in[idx(x,y,z)];
- const Float3 x_val = (center.x - xn.x)/2.0;
- const Float3 y_val = (center.y - yn.y)/2.0;
- const Float3 z_val = (center.z - zn.z)/2.0;
+ const Float x_val = (center.x - xn.x)/2.0;
+ const Float y_val = (center.y - yn.y)/2.0;
+ const Float z_val = (center.z - zn.z)/2.0;
__syncthreads();
dev_out_x[faceidx] = x_val;
t@@ -3229,7 +3229,7 @@ __global__ void interpolateFaceToCenter(
const Float z_n = dev_in_x[vidx(x,y,z)];
const Float z_p = dev_in_x[vidx(x,y,z+1)];
- const val = MAKE_FLOAT3(
+ const Float3 val = MAKE_FLOAT3(
(x_n + x_p)/2.0,
(y_n + y_p)/2.0,
(z_n + z_p)/2.0);
t@@ -3241,7 +3241,7 @@ __global__ void interpolateFaceToCenter(
// Launch per cell face node. Set velocity ghost nodes beforehand.
// Find div(tau) at all cell faces.
-__global__ findFaceDivTau(
+__global__ void findFaceDivTau(
Float* dev_ns_v_x,
Float* dev_ns_v_y,
Float* dev_ns_v_z,