trevert rate-state.py to orig, add new script with faster shear - 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 84a3ed0347d85985613b60014a6e3fc2bf347cd1
(DIR) parent 4cbb9e5ccc3fe7bf454b1cf41629ace7209e155d
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Wed, 13 Apr 2016 09:54:34 -0700
revert rate-state.py to orig, add new script with faster shear
Diffstat:
M python/rate-state.py | 5 ++---
C python/rate-state.py -> python/rat… | 0
2 files changed, 2 insertions(+), 3 deletions(-)
---
(DIR) diff --git a/python/rate-state.py b/python/rate-state.py
t@@ -9,7 +9,7 @@ import numpy
# start with
# ipython sigma-sim1-starter.py 0 1 1.0 2.0e-16 10000.0 2.080e-7 1.0
-sid_prefix = 'ratestate4'
+sid_prefix = 'ratestate3'
# device = int(sys.argv[1])
# wet = int(sys.argv[2])
t@@ -73,8 +73,7 @@ if start_from_beginning:
sim.adjustUpperWall()
sim.zeroKinematics()
- #sim.shear(1.0/20.0 * velfac)
- sim.shear(1.0/20.0 * velfac * 10.)
+ sim.shear(1.0/20.0 * velfac)
K_q_real = 36.4e9
K_w_real = 2.2e9
(DIR) diff --git a/python/rate-state.py b/python/rate-state4.py