tadd base value to plot. call modulation function after initTemporal - 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 9762c0643928b170c341418176a43ebee2ccd9bc
(DIR) parent f0dc3b9d95061ed6a6ef8bbf98628002b7f4f0d7
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Wed, 21 Jan 2015 12:39:26 +0100
add base value to plot. call modulation function after initTemporal
Diffstat:
M python/halfshear-darcy-stress-mod-… | 2 +-
M python/sphere.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
(DIR) diff --git a/python/halfshear-darcy-stress-mod-starter.py b/python/halfshear-darcy-stress-mod-starter.py
t@@ -63,7 +63,6 @@ if fluid:
sim.w_sigma0[0] = sigma0
sim.w_m[0] = numpy.abs(sigma0*sim.L[0]*sim.L[1]/sim.g[2])
-sim.setTopWallNormalStressModulation(A=mod_A, f=mod_f)
#sim.setStiffnessNormal(36.4e9 * 0.1 / 2.0)
#sim.setStiffnessTangential(36.4e9/3.0 * 0.1 / 2.0)
t@@ -80,6 +79,7 @@ sim.initTemporal(total = 20.0, file_dt = 0.01, epsilon=0.07)
#sim.initTemporal(total = 20.0, file_dt = 0.00001, epsilon=0.07)
#sim.time_dt[0] *= 1.0e-2
#sim.initTemporal(total = 1.0e-4, file_dt = 1.0e-5, epsilon=0.07)
+sim.setTopWallNormalStressModulation(A=mod_A, f=mod_f)
# Fix lowermost particles
#dz = sim.L[2]/sim.num[2]
(DIR) diff --git a/python/sphere.py b/python/sphere.py
t@@ -5207,7 +5207,7 @@ class sim:
steps_left = (self.time_total[0] - self.time_current[0]) \
/self.time_file_dt[0]
t = numpy.linspace(self.time_current[0], self.time_total[0], steps_left)
- f = A*numpy.sin(2.0*numpy.pi*f*t + phi)
+ f = baseval + A*numpy.sin(2.0*numpy.pi*f*t + phi)
plt.plot(t, f, plotstyle)
plt.grid()
plt.xlabel(xlabel)