told formulation of wall stress - sphere - GPU-based 3D discrete element method… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 63009d48011ba447f2ac372b36afe63dbb0d978e | |
parent 5e234fe2c18c005b32bd0747fc74c2485ec09bb8 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 19 Sep 2014 15:44:35 +0200 | |
old formulation of wall stress | |
Diffstat: | |
M python/shear-starter.py | 2 +- | |
M src/integration.cuh | 4 ++-- | |
2 files changed, 3 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/python/shear-starter.py b/python/shear-starter.py | |
t@@ -54,7 +54,7 @@ sim.initTemporal(total = 20.0, file_dt = 0.01, epsilon=0.07) | |
sim.c_phi[0] = c_phi | |
sim.c_grad_p[0] = c_grad_p | |
sim.w_devs[0] = sigma0 | |
-sim.w_m[0] = numpy.abs(sigma0*sim.L[0]*sim.L[1]/sim.g[2]) | |
+#sim.w_m[0] = numpy.abs(sigma0*sim.L[0]*sim.L[1]/sim.g[2]) | |
sim.mu_s[0] = 0.5 | |
sim.mu_d[0] = 0.5 | |
diff --git a/src/integration.cuh b/src/integration.cuh | |
t@@ -347,12 +347,12 @@ __global__ void integrateWalls( | |
Float acc = (w_mvfd.z + N)/w_mvfd.x; | |
// Apply gravity | |
- if (idx == 0) | |
+ /*if (idx == 0) | |
acc += devC_params.g[2]; | |
else if (idx == 1) | |
acc += devC_params.g[0]; | |
else if (idx == 2) | |
- acc += devC_params.g[1]; | |
+ acc += devC_params.g[1];*/ | |
// If Wall BC is controlled by velocity, it should not change | |
if (wmode == 2) { |