tfixed bug in adjustUpperWall - sphere - GPU-based 3D discrete element method a… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 33b024003a61f5f515d6eac91b20a2b5b616a3d1 | |
parent 0e01769e8f4499a0297c1fadcea987c70b8dded6 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 27 Aug 2013 13:59:37 +0200 | |
fixed bug in adjustUpperWall | |
Diffstat: | |
M python/sphere.py | 10 ++++------ | |
1 file changed, 4 insertions(+), 6 deletions(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -889,22 +889,20 @@ class Spherebin: | |
def adjustUpperWall(self, z_adjust = 1.1): | |
'Included for legacy purposes, calls adjustWall with idx=0' | |
- self.adjustWall(idx=0, adjust = z_adjust) | |
# Initialize upper wall | |
self.nw = numpy.ones(1) | |
self.wmode = numpy.zeros(1) # fixed BC | |
self.w_n = numpy.zeros(self.nw*self.nd, dtype=numpy.float64).reshape(s… | |
self.w_n[0,2] = -1.0 | |
- if (idx == 0 or idx == 1 or idx == 3): | |
- self.w_x = numpy.array([xmax]) | |
- else: | |
- self.w_x = numpy.array([xmin]) | |
- self.w_m = numpy.array([self.rho[0] * self.np * math.pi * (cellsize/2.… | |
self.w_vel = numpy.zeros(1) | |
self.w_force = numpy.zeros(1) | |
self.w_devs = numpy.zeros(1) | |
+ self.w_x = numpy.zeros(1) | |
+ self.w_m = numpy.zeros(1) | |
+ self.adjustWall(idx=0, adjust = z_adjust) | |
+ | |
def adjustWall(self, idx, adjust = 1.1): | |
'Adjust grid and dynamic wall to max. particle position' | |