 |
tadd new sim, change appearance of shear visualization - sphere - GPU-based 3D … |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit a06ced8a9b36a17e0c4addf19f7200031ec27713 |
|
parent ad51c8045076b389f7ee142b3b4bcdb3c27da4a5 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Tue, 10 Feb 2015 08:57:07 +0100 |
|
|
|
add new sim, change appearance of shear visualization |
|
|
|
Diffstat: |
|
M python/halfshear-darcy-strength-di… | 2 +- |
|
M python/sphere.py | 12 ++++++++---- |
|
|
|
2 files changed, 9 insertions(+), 5 deletions(-) |
|
--- |
|
diff --git a/python/halfshear-darcy-strength-dilation-rate.py b/python/halfshea… |
|
t@@ -22,7 +22,7 @@ sigma0 = 20000.0 |
|
#k_c_vals = [3.5e-13, 3.5e-15] |
|
k_c = 3.5e-15 |
|
#k_c = 3.5e-13 |
|
-mu_f_vals = [1.797e-06, 1.204e-06, 1.797e-08] |
|
+mu_f_vals = [1.797e-06, 1.204e-06, 5.0e-8, 1.797e-08] |
|
#velfac_vals = [0.5, 1.0, 2.0] |
|
velfac = 1.0 |
|
|
|
diff --git a/python/sphere.py b/python/sphere.py |
|
t@@ -5837,13 +5837,16 @@ class sim: |
|
ax1 = plt.subplot2grid((2,1), (0,0)) |
|
ax1.set_xlabel('Shear strain [-]') |
|
#ax1.set_ylabel('Stress [Pa]') |
|
- ax1.set_ylabel('Shear friction $\\tau/\\sigma\'$ [-]') |
|
+ #ax1.set_ylabel('Shear friction $\\tau/\\sigma\'$ [-]') |
|
+ ax1.set_ylabel('Shear friction $\\tau/\\sigma_0$ [-]') |
|
#ax1.plot(xdisp / w_x0, sigma_eff, '+-g', label="$\sigma'$") |
|
#ax1.plot(xdisp / w_x0, sigma_def, '+-b', label="$\sigma_0$") |
|
#ax1.plot(xdisp / w_x0, tau, '+-r', label="$\\tau$") |
|
ax1.plot(self.shear_strain[1:],\ |
|
- self.tau[1:]/self.sigma_eff[1:],\ |
|
- '.-', label="$\\tau$") |
|
+ self.tau[1:]/self.sigma_def[1:],\ |
|
+ #self.tau[1:]/self.sigma_eff[1:],\ |
|
+ '-', label="$\\tau/\\sigma_0$") |
|
+ #'.-', label="$\\tau$") |
|
#ax1.legend(loc=4) |
|
ax1.grid() |
|
|
|
t@@ -5853,7 +5856,8 @@ class sim: |
|
#ax2.set_ylabel('Dilation [m]') |
|
#ax2.set_ylabel('Dilation [%]') |
|
ax2.set_ylabel('Dilation, $\Delta h/(2\\bar{r})$ [m]') |
|
- ax2.plot(self.shear_strain, self.dilation, '.-') |
|
+ #ax2.plot(self.shear_strain, self.dilation, '.-') |
|
+ ax2.plot(self.shear_strain, self.dilation, '-') |
|
ax2.grid() |
|
|
|
if xlim: |
