tRe-enabled wmode in wall integration - sphere - GPU-based 3D discrete element … | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit cb24d20c8c7b7912dc647b34ce644ab133dcd47a | |
parent 6f1f3e6b4a43e5c8e502aeb9508045b8754402da | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 6 Sep 2012 14:31:59 +0200 | |
Re-enabled wmode in wall integration | |
Diffstat: | |
M src/integration.cuh | 10 +++++----- | |
1 file changed, 5 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/src/integration.cuh b/src/integration.cuh | |
t@@ -173,7 +173,7 @@ __global__ void integrateWalls(Float4* dev_w_nx, | |
// write-after-read, or write-after-write hazards. | |
Float4 w_nx = dev_w_nx[idx]; | |
Float4 w_mvfd = dev_w_mvfd[idx]; | |
- //int wmode = devC_wmode[idx]; // Wall BC, 0: devs, 1: vel | |
+ int wmode = devC_wmode[idx]; // Wall BC, 0: devs, 1: vel | |
Float acc; | |
// Find the final sum of forces on wall | |
t@@ -185,7 +185,7 @@ __global__ void integrateWalls(Float4* dev_w_nx, | |
Float dt = devC_dt; | |
// If wall BC is controlled by deviatoric stress: | |
- //if (wmode == 0) { | |
+ if (wmode == 0) { | |
// Normal load = Deviatoric stress times wall surface area, | |
// directed downwards. | |
t@@ -199,9 +199,9 @@ __global__ void integrateWalls(Float4* dev_w_nx, | |
w_mvfd.y += acc * dt; | |
// Wall BC is controlled by velocity, which should not change | |
- //} else if (wmode == 1) { | |
- // acc = 0.0f; | |
- //} | |
+ } else if (wmode == 1) { | |
+ acc = 0.0f; | |
+ } | |
// Update position. Second-order scheme based on Taylor expansion | |
// (greater accuracy than the first-order Euler's scheme) |