tupdate call to findDarcyPressureForce - sphere - GPU-based 3D discrete element… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 25aaf8dd3bd580680e694d55409be431a892e93b | |
parent dc8fc91c8082cc4749f68a8b334a410d13313332 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 13 Nov 2014 09:06:22 +0100 | |
update call to findDarcyPressureForce | |
Diffstat: | |
M src/device.cu | 26 +++++++++++++------------- | |
1 file changed, 13 insertions(+), 13 deletions(-) | |
--- | |
diff --git a/src/device.cu b/src/device.cu | |
t@@ -1785,6 +1785,18 @@ __host__ void DEM::startTime() | |
&t_findDarcyPorosities); | |
checkForCudaErrorsIter("Post findDarcyPorosities", iter); | |
+ if (walls.nw > 0 && walls.wmode[0] == 1) { | |
+ wall0_iz = walls.nx->w/(grid.L[2]/grid.num[2]); | |
+ /*setDarcyTopWallPressure | |
+ <<<dimGridFluid, dimBlockFluid>>>( | |
+ new_pressure, | |
+ wall0_iz, | |
+ dev_darcy_p); | |
+ cudaThreadSynchronize(); | |
+ checkForCudaErrorsIter("Post setDarcyTopWallPressure", | |
+ iter);*/ | |
+ } | |
+ | |
if (np > 0) { | |
if (PROFILING == 1) | |
t@@ -1804,6 +1816,7 @@ __host__ void DEM::startTime() | |
dev_x, | |
dev_darcy_p, | |
dev_darcy_phi, | |
+ wall0_iz, | |
dev_force, | |
dev_darcy_f_p); | |
cudaThreadSynchronize(); | |
t@@ -1837,18 +1850,6 @@ __host__ void DEM::startTime() | |
checkForCudaErrorsIter("Post setUpperPressureNS", iter… | |
} | |
- if (walls.nw > 0 && walls.wmode[0] == 1) { | |
- wall0_iz = walls.nx->w/(grid.L[2]/grid.num[2]); | |
- /*setDarcyTopWallPressure | |
- <<<dimGridFluid, dimBlockFluid>>>( | |
- new_pressure, | |
- wall0_iz, | |
- dev_darcy_p); | |
- cudaThreadSynchronize(); | |
- checkForCudaErrorsIter("Post setDarcyTopWallPressure… | |
- iter);*/ | |
- } | |
- | |
if (PROFILING == 1) | |
startTimer(&kernel_tic); | |
findDarcyPermeabilities<<<dimGridFluid, dimBlockFluid>>>( | |
t@@ -2225,7 +2226,6 @@ __host__ void DEM::startTime() | |
iter); | |
} | |
- | |
// Pause the CPU thread until all CUDA calls previously issued are | |
// completed | |
cudaThreadSynchronize(); |