 |
tAdded self to member function calls - sphere - GPU-based 3D discrete element m… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit bec2d715c4027803beb7d160ea0b0df2c1b860b8 |
|
parent 7a214ddc6f0d04e40e727daef074c202acc56c79 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Wed, 28 Nov 2012 13:34:46 +0100 |
|
|
|
Added self to member function calls |
|
|
|
Diffstat: |
|
M python/sphere.py | 12 ++++++------ |
|
|
|
1 file changed, 6 insertions(+), 6 deletions(-) |
|
--- |
|
diff --git a/python/sphere.py b/python/sphere.py |
|
t@@ -661,10 +661,10 @@ class Spherebin: |
|
""" |
|
|
|
# Zero the kinematics of all particles |
|
- zeroKinematics() |
|
+ self.zeroKinematics() |
|
|
|
# Adjust grid and placement of upper wall |
|
- adjustUpperWall() |
|
+ self.adjustUpperWall() |
|
|
|
# Set the top wall BC to a value of deviatoric stress |
|
sekf.wmode = numpy.array([1]) |
|
t@@ -679,10 +679,10 @@ class Spherebin: |
|
""" |
|
|
|
# zero kinematics |
|
- zeroKinematics() |
|
+ self.zeroKinematics() |
|
|
|
# Initialize upper wall |
|
- adjustUpperWall() |
|
+ self.adjustUpperWall() |
|
self.wmode = numpy.array([2]) # strain rate BC |
|
self.w_vel = numpy.array([wvel]) |
|
|
|
t@@ -701,13 +701,13 @@ class Spherebin: |
|
z_min = numpy.min(self.x[:,2] - self.radius) |
|
z_max = numpy.max(self.x[:,2] + self.radius) |
|
cellsize = self.L[0] / self.num[0] |
|
- adjustUpperWall(z_adjust = 1.3) |
|
+ self.adjustUpperWall(z_adjust = 1.3) |
|
|
|
# Initialize upper wall |
|
self.w_devs[0] = deviatoric_stress |
|
|
|
# zero kinematics |
|
- zeroKinematics() |
|
+ self.zeroKinematics() |
|
|
|
#fixheight = 2*cellsize |
|
fixheight = cellsize |
