tread modulation from current object instead of self - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
HTML git clone git://src.adamsgaard.dk/sphere
DIR Log
DIR Files
DIR Refs
DIR LICENSE
---
DIR commit 7c528a4815f61b41d83f05c0fb1ec5f0e80d4d1c
DIR parent c456eb21a7529669276d50f4a9dceff9b13b405e
HTML Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Fri, 23 Jan 2015 10:24:57 +0100
read modulation from current object instead of self
Diffstat:
M python/sphere.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
---
DIR diff --git a/python/sphere.py b/python/sphere.py
t@@ -5879,12 +5879,7 @@ class sim:
w_x0 = sb.w_x[0] # Original height
A = sb.L[0]*sb.L[1] # Upper surface area
- d_bar = numpy.mean(self.radius)*2.0
- if numpy.isnan(d_bar):
- print('No radii in self.radius, attempting to read '
- + 'first file')
- self.readfirst()
- d_bar = numpy.mean(self.radius)*2.0
+ d_bar = numpy.mean(sb.radius)*2.0
time[i] = sb.time_current[0]
t@@ -5951,7 +5946,7 @@ class sim:
# Lower plot
ax3 = plt.subplot(2, 1, 2, sharex=ax1)
- if self.w_sigma0_A > 1.0e-3:
+ if sb.w_sigma0_A > 1.0e-3:
lns1 = ax3.plot(time, self.sigma_eff/1000.0,
'-k', label="$\\sigma'$")
lns2 = ax3.plot(time,