tonly find porosity in cfd time steps - 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 07cc1ea7698c51c0424bb463ddd81ef69585157b
(DIR) parent 124765ec0a23ab0b8477336ef25505528a82188a
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 24 Mar 2015 09:41:19 +0100
only find porosity in cfd time steps
Diffstat:
M src/device.cu | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
---
(DIR) diff --git a/src/device.cu b/src/device.cu
t@@ -1827,7 +1827,7 @@ __host__ void DEM::startTime()
checkForCudaErrorsIter("Post setDarcyGhostNodes("
"dev_darcy_grad_p)", iter);
- if (PROFILING == 1)
+ /*if (PROFILING == 1)
startTimer(&kernel_tic);
findDarcyPorositiesLinear<<<dimGridFluid, dimBlockFluid>>>(
dev_cellStart,
t@@ -1845,7 +1845,7 @@ __host__ void DEM::startTime()
if (PROFILING == 1)
stopTimer(&kernel_tic, &kernel_toc, &kernel_elapsed,
&t_findDarcyPorosities);
- checkForCudaErrorsIter("Post findDarcyPorosities", iter);
+ checkForCudaErrorsIter("Post findDarcyPorosities", iter);*/
/*findDarcyPressureForce<<<dimGrid, dimBlock>>>(
dev_x,
t@@ -1872,9 +1872,9 @@ __host__ void DEM::startTime()
if ((iter % darcy.ndem) == 0) {
- /*if (PROFILING == 1)
+ if (PROFILING == 1)
startTimer(&kernel_tic);
- findDarcyPorosities<<<dimGridFluid, dimBlockFluid>>>(
+ /*findDarcyPorosities<<<dimGridFluid, dimBlockFluid>>>(
dev_cellStart,
dev_cellEnd,
dev_x_sorted,
t@@ -1884,7 +1884,19 @@ __host__ void DEM::startTime()
np,
darcy.c_phi,
dev_darcy_phi,
- dev_darcy_dphi);
+ dev_darcy_dphi);*/
+ findDarcyPorositiesLinear<<<dimGridFluid, dimBlockFluid>>>(
+ dev_cellStart,
+ dev_cellEnd,
+ dev_x_sorted,
+ dev_vel_sorted,
+ iter,
+ darcy.ndem,
+ np,
+ darcy.c_phi,
+ dev_darcy_phi,
+ dev_darcy_dphi,
+ dev_darcy_div_v_p);
cudaThreadSynchronize();
if (PROFILING == 1)
stopTimer(&kernel_tic, &kernel_toc, &kernel_elapsed,