tUpdated wall integration scheme - sphere - GPU-based 3D discrete element metho… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 18f1c3b4859a655a666c6e987412d3dae28d50d7 | |
parent 2e6fee6cb464d61819b5811d9a6853cf4d95b640 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 27 Nov 2012 08:50:44 +0100 | |
Updated wall integration scheme | |
Diffstat: | |
M src/integration.cuh | 10 +++++----- | |
1 file changed, 5 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/src/integration.cuh b/src/integration.cuh | |
t@@ -262,14 +262,14 @@ __global__ void integrateWalls(Float4* dev_walls_nx, | |
acc = 0.0f; | |
} | |
- // Update linear velocity | |
- w_mvfd.y += acc * dt; | |
- | |
// Update position. Second-order scheme based on Taylor expansion | |
- //w_nx.w += w_mvfd.y * dt + (acc * dt*dt)/2.0f; | |
+ w_nx.w += w_mvfd.y * dt + (acc * dt*dt)/2.0; | |
// Update position. First-order Euler integration scheme | |
- w_nx.w += w_mvfd.y * dt; | |
+ //w_nx.w += w_mvfd.y * dt; | |
+ | |
+ // Update linear velocity | |
+ w_mvfd.y += acc * dt; | |
// Store data in global memory | |
dev_walls_nx[idx] = w_nx; |