 |
tdifferent comment style - sphere - GPU-based 3D discrete element method algori… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit a25a982fa935925a8d6d952894be275b46fdcd53 |
|
parent a10cb4c91e0e697fdfed3e9825fe2fb3638d67fe |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Tue, 22 Oct 2013 09:54:09 +0200 |
|
|
|
different comment style |
|
|
|
Diffstat: |
|
M src/device.cu | 13 ++++++------- |
|
|
|
1 file changed, 6 insertions(+), 7 deletions(-) |
|
--- |
|
diff --git a/src/device.cu b/src/device.cu |
|
t@@ -916,7 +916,7 @@ __host__ void DEM::startTime() |
|
if (params.nu > 0.0 && darcy == 1) { |
|
|
|
#ifdef DARCY_GPU |
|
- //* |
|
+ |
|
checkForCudaErrors("Before findPorositiesCubicDev", iter); |
|
// Find cell porosities |
|
if (PROFILING == 1) |
|
t@@ -926,11 +926,11 @@ __host__ void DEM::startTime() |
|
dev_cellEnd, |
|
dev_x_sorted, |
|
dev_d_phi); |
|
- /*findPorositiesSphericalDev<<<dimGridFluid, dimBlockFluid>>>( |
|
- dev_cellStart, |
|
- dev_cellEnd, |
|
- dev_x_sorted, |
|
- dev_d_phi);*/ |
|
+ //findPorositiesSphericalDev<<<dimGridFluid, dimBlockFluid>>>( |
|
+ //dev_cellStart, |
|
+ //dev_cellEnd, |
|
+ //dev_x_sorted, |
|
+ //dev_d_phi); |
|
cudaThreadSynchronize(); |
|
if (PROFILING == 1) |
|
stopTimer(&kernel_tic, &kernel_toc, &kernel_elapsed, |
|
t@@ -1016,7 +1016,6 @@ __host__ void DEM::startTime() |
|
stopTimer(&kernel_tic, &kernel_toc, &kernel_elapsed, |
|
&t_findDarcyVelocitiesDev); |
|
checkForCudaErrors("Post findDarcyVelocitiesDev", iter); |
|
- //*/ |
|
|
|
#else |
|
// Copy device data to host memory |
