tadd missing } - 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 5b3238dad8b0f33d60bebbe7dbdb400259f11ca9
(DIR) parent 4214722dd97aae6fd37939c6d7a2b351725e4da9
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Thu, 22 Jan 2015 10:16:03 +0100
add missing }
Diffstat:
M src/darcy.cuh | 4 ++--
M src/device.cu | 17 +++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
---
(DIR) diff --git a/src/darcy.cuh b/src/darcy.cuh
t@@ -976,7 +976,7 @@ __global__ void firstDarcySolution(
// Dirichlet BC at dynamic top wall. wall0_iz will be larger than the
// grid if the wall isn't dynamic
if ((bc_bot == 0 && z == 0) || (bc_top == 0 && z == nz-1)
- || (z >= wall0_iz && bc_top == 0))
+ || (z >= wall0_iz - 1 && bc_top == 0))
dp_expl = 0.0;
#ifdef REPORT_FORCING_TERMS
t@@ -1128,7 +1128,7 @@ __global__ void updateDarcySolution(
// Dirichlet BC at dynamic top wall. wall0_iz will be larger than the
// grid if the wall isn't dynamic
if ((bc_bot == 0 && z == 0) || (bc_top == 0 && z == nz-1)
- || (z >= wall0_iz && bc_top == 0))
+ || (z >= wall0_iz - 1 && bc_top == 0))
dp_impl = 0.0;
//p_new = p;
(DIR) diff --git a/src/device.cu b/src/device.cu
t@@ -1835,14 +1835,15 @@ __host__ void DEM::startTime()
*sin(2.0*M_PI*darcy.p_mod_f*time.current
+ darcy.p_mod_phi);
- setDarcyTopWallPressure
- <<<dimGridFluid, dimBlockFluid>>>(
- new_pressure,
- wall0_iz,
- dev_darcy_p);
- cudaThreadSynchronize();
- checkForCudaErrorsIter("Post setDarcyTopWallPressure",
- iter);
+ setDarcyTopWallPressure
+ <<<dimGridFluid, dimBlockFluid>>>(
+ new_pressure,
+ wall0_iz,
+ dev_darcy_p);
+ cudaThreadSynchronize();
+ checkForCudaErrorsIter("Post setDarcyTopWallPressure",
+ iter);
+ }
}
if (np > 0) {