tupdate plots, shear test script - sphere - GPU-based 3D discrete element metho… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 81dcc7c9d40b48df512156b2296a1498714a0afc | |
parent 150551a348e8d69734ab67aeff8e577cb743c165 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Wed, 20 May 2015 09:25:11 +0200 | |
update plots, shear test script | |
Diffstat: | |
M python/halfshear-darcy-creep-dynam… | 10 +++++----- | |
M python/shear-test.py | 8 ++++---- | |
2 files changed, 9 insertions(+), 9 deletions(-) | |
--- | |
diff --git a/python/halfshear-darcy-creep-dynamics.py b/python/halfshear-darcy-… | |
t@@ -29,9 +29,11 @@ matplotlib.rc('grid', linestyle=':', linewidth=0.2) | |
outformat='pdf' | |
-#plotContacts=False | |
+scatter=False | |
plotContacts=True | |
-plotForceChains=False | |
+#plotContacts=False | |
+plotForceChains=True | |
+#plotForceChains=False | |
#sids = ['halfshear-darcy-sigma0=10000.0-k_c=2e-16-mu=2.08e-07-ss=2000.0-A=400… | |
sids = ['halfshear-darcy-sigma0=10000.0-k_c=2e-16-mu=2.08e-07-ss=2000.0-A=4375… | |
t@@ -56,7 +58,7 @@ Ns = [[], [], []] | |
#f_min = 1.0 | |
#f_max = 1.0e16 | |
#lower_limit = 0.3 | |
-lower_limit = 0.5 | |
+lower_limit = 0.2 | |
#upper_limit = 0.5 | |
upper_limit = 1.0 | |
f_n_max = 50 # for force chain plots | |
t@@ -64,8 +66,6 @@ f_n_max = 50 # for force chain plots | |
N = numpy.zeros_like(steps, dtype=numpy.float64) | |
t = numpy.zeros_like(steps, dtype=numpy.float64) | |
-scatter=False | |
- | |
# insert plot positions | |
Lx=[.17, .37, .65] | |
Ly=[.3, .7, .4] | |
diff --git a/python/shear-test.py b/python/shear-test.py | |
t@@ -1,7 +1,7 @@ | |
#!/usr/bin/env python | |
# Import sphere functionality | |
-from sphere import * | |
+import sphere | |
### EXPERIMENT SETUP ### | |
initialization = True | |
t@@ -23,7 +23,7 @@ devslist = [80e3, 10e3, 20e3, 40e3, 60e3, 120e3] | |
### INITIALIZATION ### | |
# New class | |
-init = Spherebin(np = np, nd = 3, nw = 0, sid = sim_id + "-init") | |
+init = sphere.sim(np = np, nd = 3, nw = 0, sid = sim_id + "-init") | |
# Save radii | |
init.generateRadii(mean = 0.02) | |
t@@ -68,7 +68,7 @@ for devs in devslist: | |
### CONSOLIDATION ### | |
# New class | |
- cons = Spherebin(np = init.np, nw = 1, sid = sim_id + "-cons-devs{}".forma… | |
+ cons = sphere.sim(np = init.np, nw = 1, sid = sim_id + "-cons-devs{}".form… | |
# Read last output file of initialization step | |
lastf = status(sim_id + "-init") | |
t@@ -117,7 +117,7 @@ for devs in devslist: | |
### SHEARING ### | |
# New class | |
- shear = Spherebin(np = cons.np, nw = cons.nw, sid = sim_id + "-shear-devs{… | |
+ shear = sphere.sim(np = cons.np, nw = cons.nw, sid = sim_id + "-shear-devs… | |
# Read last output file of initialization step | |
lastf = status(sim_id + "-cons-devs{}".format(devs)) |