tuse hanning smoothing, widen smoothing window - sphere - GPU-based 3D discrete… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 2872548a8c5c35dab22746f6a851a87bd328b390 | |
parent 71624f8de6086d863b18639b703d4d28e32516ef | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 14 Apr 2015 20:49:17 +0200 | |
use hanning smoothing, widen smoothing window | |
Diffstat: | |
M python/halfshear-darcy-strength-di… | 5 +---- | |
M python/halfshear-darcy-strength-di… | 9 ++++----- | |
2 files changed, 5 insertions(+), 9 deletions(-) | |
--- | |
diff --git a/python/halfshear-darcy-strength-dilation-rate.py b/python/halfshea… | |
t@@ -24,7 +24,7 @@ pressures = True | |
zflow = False | |
contact_forces = False | |
smooth_friction = True | |
-smooth_window = 30 | |
+smooth_window = 10 | |
#sigma0_list = numpy.array([1.0e3, 2.0e3, 4.0e3, 10.0e3, 20.0e3, 40.0e3]) | |
sigma0 = 20000.0 | |
t@@ -97,9 +97,6 @@ def smooth(x, window_len=10, window='hanning'): | |
return y[window_len-1:-window_len+1] | |
-smooth_window = 10 | |
- | |
- | |
shear_strain = [[], [], [], []] | |
friction = [[], [], [], []] | |
dilation = [[], [], [], []] | |
diff --git a/python/halfshear-darcy-strength-dilation.py b/python/halfshear-dar… | |
t@@ -24,7 +24,8 @@ pressures = True | |
zflow = False | |
contact_forces = False | |
smooth_friction = True | |
-smooth_window = 30 | |
+smooth_window = 100 | |
+#smooth_window = 200 | |
#sigma0_list = numpy.array([1.0e3, 2.0e3, 4.0e3, 10.0e3, 20.0e3, 40.0e3]) | |
sigma0 = 20000.0 | |
t@@ -40,6 +41,7 @@ velfac = 1.0 | |
# return a smoothed version of in. The returned array is smaller than the | |
# original input array | |
def smooth(x, window_len=10, window='hanning'): | |
+#def smooth(x, window_len=10, window='flat'): | |
"""smooth the data using a window with requested size. | |
This method is based on the convolution of a scaled window with the signal. | |
t@@ -94,9 +96,6 @@ def smooth(x, window_len=10, window='hanning'): | |
return y[window_len-1:-window_len+1] | |
-smooth_window = 10 | |
- | |
- | |
shear_strain = [[], [], [], []] | |
friction = [[], [], [], []] | |
dilation = [[], [], [], []] | |
t@@ -401,7 +400,7 @@ for c in numpy.arange(0,len(k_c_vals)): | |
#ax3.get_yaxis().tick_left() | |
plt.setp(ax3.get_yticklabels(), visible=False) | |
if c == 1: | |
- ax3.get_yaxis().tick_left() | |
+ #ax3.get_yaxis().tick_left() | |
ax3.spines['left'].set_visible(True) | |