treenable div_phi_vi_v - sphere - GPU-based 3D discrete element method algorith… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 768042ba9afa35c5e6fd8f68d27c97e20279c371 | |
parent 641c74b33e4be903d126046bc97259e0b22fdef0 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 3 Jun 2014 11:01:12 +0200 | |
reenable div_phi_vi_v | |
Diffstat: | |
M src/device.cu | 2 +- | |
M src/navierstokes.cuh | 1 - | |
M src/sphere.h | 2 +- | |
3 files changed, 2 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/src/device.cu b/src/device.cu | |
t@@ -1051,12 +1051,12 @@ __host__ void DEM::startTime() | |
dev_ns_v_x, | |
dev_ns_v_y, | |
dev_ns_v_z, | |
- dev_ns_v, | |
dev_ns_phi, | |
dev_ns_dphi, | |
dev_ns_div_tau_x, | |
dev_ns_div_tau_y, | |
dev_ns_div_tau_z, | |
+ dev_ns_div_phi_vi_v, | |
ns.bc_bot, | |
ns.bc_top, | |
ns.beta, | |
diff --git a/src/navierstokes.cuh b/src/navierstokes.cuh | |
t@@ -2090,7 +2090,6 @@ __global__ void findPredNSvelocities( | |
Float* dev_ns_v_x, // in | |
Float* dev_ns_v_y, // in | |
Float* dev_ns_v_z, // in | |
- Float3* dev_ns_v, // in | |
Float* dev_ns_phi, // in | |
Float* dev_ns_dphi, // in | |
Float* dev_ns_div_tau_x, // in | |
diff --git a/src/sphere.h b/src/sphere.h | |
t@@ -194,7 +194,7 @@ class DEM { | |
Float3* dev_ns_f2; // Constant slopes in forcing function | |
Float* dev_ns_v_prod; // Outer product of fluid velocities | |
//Float* dev_ns_tau; // Fluid stress tensor | |
- //Float3* dev_ns_div_phi_vi_v; // div(phi*vi*v) | |
+ Float3* dev_ns_div_phi_vi_v; // div(phi*vi*v) | |
//Float3* dev_ns_div_phi_tau; // div(phi*tau) | |
Float3* dev_ns_div_tau; // div(tau) | |
Float* dev_ns_div_tau_x; // div(tau) on x-face |