tplot sigma0, fix currentNormalStress function - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
(HTM) git clone git://src.adamsgaard.dk/sphere
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit 73fc14153c9b57e66bc392fa2f53590b3b9cee57
(DIR) parent 499efcac0f664a7dd50ef2a4c40a2eac545bd4eb
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Sat, 31 Jan 2015 10:20:56 +0100
plot sigma0, fix currentNormalStress function
Diffstat:
M python/sphere.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
(DIR) diff --git a/python/sphere.py b/python/sphere.py
t@@ -3550,7 +3550,7 @@ class sim:
'''
return self.w_sigma0[0] \
+ self.w_sigma0_A[0] \
- *numpy.sin(2.0*numpy.pi*self.time_current[0])
+ *numpy.sin(2.0*numpy.pi*self.w_sigma0_f[0]*self.time_current[0])
def volume(self, idx):
'''
t@@ -5955,8 +5955,10 @@ class sim:
# Lower plot
ax3 = plt.subplot(2, 1, 2, sharex=ax1)
if sb.w_sigma0_A > 1.0e-3:
+ lns0 = ax3.plot(time, self.sigma_def/1000.0,
+ '-k', label="$\\sigma_0$")
lns1 = ax3.plot(time, self.sigma_eff/1000.0,
- '-k', label="$\\sigma'$")
+ '--k', label="$\\sigma'$")
lns2 = ax3.plot(time,
numpy.ones_like(time)*sb.w_tau_x/1000.0,
'--k', label="$\\tau$")
t@@ -5993,7 +5995,7 @@ class sim:
tl.set_color(ax4color)
if sb.w_sigma0_A > 1.0e-3:
#ax4.legend(loc='upper right')
- lns = lns1+lns2+lns3+lns4+lns5
+ lns = lns0+lns1+lns2+lns3+lns4+lns5
labs = [l.get_label() for l in lns]
ax4.legend(lns, labs, loc='upper right')