tuse correct ndem value, add ndem test - sphere - GPU-based 3D discrete element… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 4fd218f392a7cbdcf7a31056cdc33de93324bff5 | |
parent ea8067eeef0eaeb962695192e3b978fa6b413fc5 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 7 Nov 2014 09:44:20 +0100 | |
use correct ndem value, add ndem test | |
Diffstat: | |
M src/device.cu | 2 +- | |
M tests/cfd_tests_darcy_particles.py | 24 ++++++++++++++++++++++++ | |
2 files changed, 25 insertions(+), 1 deletion(-) | |
--- | |
diff --git a/src/device.cu b/src/device.cu | |
t@@ -1795,7 +1795,7 @@ __host__ void DEM::startTime() | |
iter); | |
} | |
- if ((iter % ns.ndem) == 0) { | |
+ if ((iter % darcy.ndem) == 0) { | |
// Modulate the pressures at the upper boundary cells | |
if ((darcy.p_mod_A > 1.0e-5 || darcy.p_mod_A < -1.0e-5) && | |
diff --git a/tests/cfd_tests_darcy_particles.py b/tests/cfd_tests_darcy_particl… | |
t@@ -138,6 +138,30 @@ py = sphere.sim(sid = orig.sid, fluid = True) | |
py.readlast(verbose=False) | |
test(orig.w_x[0] > py.w_x[0], 'Wall movement:\t\t') | |
+print("### Dynamic wall: Transient, gravity, Dirichlet+Neumann BCs, ndem=10") | |
+#orig = sphere.sim('diffusivity-relax', fluid=False) | |
+orig = sphere.sim('cube-init', fluid=False) | |
+orig.readlast(verbose=False) | |
+orig.num[2] /= 2 | |
+orig.L[2] /= 2.0 | |
+orig.id('darcy_fluidization') | |
+orig.cleanup() | |
+orig.setStiffnessNormal(36.4e9) | |
+orig.setStiffnessTangential(36.4e9/3.0) | |
+orig.initTemporal(total=0.0005, file_dt=0.0001) | |
+orig.initFluid(cfd_solver=1) | |
+orig.setDEMstepsPerCFDstep(10) | |
+orig.setFluidBottomNoFlow() | |
+orig.g[2] = -10.0 | |
+#orig.k_c[0] = numpy.mean(orig.radius)**2/540.0 | |
+orig.consolidate() | |
+ | |
+orig.run(verbose=False) | |
+#orig.writeVTKall() | |
+py = sphere.sim(sid = orig.sid, fluid = True) | |
+py.readlast(verbose=False) | |
+test(orig.w_x[0] > py.w_x[0], 'Wall movement:\t\t') | |
+ | |
print("### Fluidization test: Transient, gravity, Dirichlet+Dirichlet BCs") | |
#orig = sphere.sim('diffusivity-relax', fluid=False) |