 |
tuse current value instead of defined normal stress - sphere - GPU-based 3D dis… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 8d0a3d46b503475d3421879790a168b3eae45395 |
|
parent ab6a20e6db11c8ccafdae970b22c88d4d88d0b59 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Mon, 2 Mar 2015 13:29:33 +0100 |
|
|
|
use current value instead of defined normal stress |
|
|
|
Diffstat: |
|
M python/sphere.py | 8 ++++---- |
|
|
|
1 file changed, 4 insertions(+), 4 deletions(-) |
|
--- |
|
diff --git a/python/sphere.py b/python/sphere.py |
|
t@@ -4500,7 +4500,7 @@ class sim: |
|
See also: :func:`shearStrainRate()` and :func:`shearVel()` |
|
''' |
|
return self.shearStrainRate() * numpy.mean(self.radius) \ |
|
- * numpy.sqrt(self.rho[0]/self.w_sigma0[0]) |
|
+ * numpy.sqrt(self.rho[0]/self.currentNormalStress()) |
|
|
|
def findOverlaps(self): |
|
''' |
|
t@@ -6545,10 +6545,10 @@ class sim: |
|
t = numpy.zeros(sb.status()) |
|
I = numpy.zeros(sb.status()) |
|
|
|
- for i in numpy.arange(sb.status): |
|
+ for i in numpy.arange(sb.status()): |
|
sb.readstep(i, verbose = False) |
|
- t = sb.currentTime() |
|
- I = sb.inertiaParameterPlanarShear() |
|
+ t[i] = sb.currentTime() |
|
+ I[i] = sb.inertiaParameterPlan[i]arShear() |
|
|
|
# Plotting |
|
if outformat != 'txt': |
