treorganize synchronization points - 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 837f320e197769680e0c4ac3a95ede30f4bb5072
(DIR) parent b2f5d9af5a8accdea3718e6b8086b26c7502904e
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 26 Aug 2014 13:42:15 +0200
reorganize synchronization points
Diffstat:
M src/navierstokes.cuh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
(DIR) diff --git a/src/navierstokes.cuh b/src/navierstokes.cuh
t@@ -2913,7 +2913,6 @@ __global__ void updateNSvelocity(
// Find new velocity
#ifdef SET_1
- __syncthreads();
Float3 v = v_p - ndem*devC_dt/(devC_params.rho_f*phi)*grad_epsilon;
#endif
#ifdef SET_2
t@@ -2940,6 +2939,7 @@ __global__ void updateNSvelocity(
v = MAKE_FLOAT3(0.0, 0.0, 0.0);
// Check the advection term using the Courant-Friedrichs-Lewy condition
+ __syncthreads();
if (v.x*ndem*devC_dt/dx
+ v.y*ndem*devC_dt/dy
+ v.z*ndem*devC_dt/dz > 1.0) {