 |
tfix fluid time step, add shear - sphere - GPU-based 3D discrete element method… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 58fa4b0b688257c1e99417a4f141d1d3b39f32df |
|
parent 9d47bd9498be4b5070067209963f832b81fa75c3 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Thu, 6 Nov 2014 12:50:24 +0100 |
|
|
|
fix fluid time step, add shear |
|
|
|
Diffstat: |
|
M python/halfshear-darcy-starter.py | 5 +++-- |
|
M python/sphere.py | 1 + |
|
|
|
2 files changed, 4 insertions(+), 2 deletions(-) |
|
--- |
|
diff --git a/python/halfshear-darcy-starter.py b/python/halfshear-darcy-starter… |
|
t@@ -35,6 +35,7 @@ sim.adjustUpperWall() |
|
sim.zeroKinematics() |
|
|
|
#sim.shear(0.0/20.0) |
|
+sim.shear(1.0/20.0) |
|
|
|
if fluid: |
|
#sim.num[2] *= 2 |
|
t@@ -61,8 +62,8 @@ sim.setDampingTangential(0.0) |
|
#sim.deleteAllParticles() |
|
sim.fixvel[:] = -1.0 |
|
|
|
-#sim.initTemporal(total = 20.0, file_dt = 0.01, epsilon=0.07) |
|
-sim.initTemporal(total = 1.0e-4, file_dt = 1.0e-5, epsilon=0.07) |
|
+sim.initTemporal(total = 20.0, file_dt = 0.01, epsilon=0.07) |
|
+#sim.initTemporal(total = 1.0e-4, file_dt = 1.0e-5, epsilon=0.07) |
|
|
|
# Fix lowermost particles |
|
#dz = sim.L[2]/sim.num[2] |
|
diff --git a/python/sphere.py b/python/sphere.py |
|
t@@ -2913,6 +2913,7 @@ class sim: |
|
# by von Neumann stability analysis of the diffusion and advection |
|
# terms |
|
if self.fluid: |
|
+ fluid_time_dt = self.largestFluidTimeStep() |
|
self.time_dt[0] = numpy.min([fluid_time_dt, self.time_dt[0]]) |
|
|
|
