tplot evolution, improve shear starter - sphere - GPU-based 3D discrete element… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit c72d1695b83bac8d014baacf62168ec2bcdea524 | |
parent 9c4bbb242df9040699c0934abd157f5c4bcf0f6a | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 1 Sep 2014 13:40:02 +0200 | |
plot evolution, improve shear starter | |
Diffstat: | |
M python/permeability-results.py | 1 + | |
M python/shear-starter.py | 19 +++++++++++++------ | |
2 files changed, 14 insertions(+), 6 deletions(-) | |
--- | |
diff --git a/python/permeability-results.py b/python/permeability-results.py | |
t@@ -46,6 +46,7 @@ for c_grad_p in cvals: | |
dpdz[c][i] = pc.dPdL[2] | |
Q[c][i] = pc.Q[2] | |
pc.findMeanPorosity() | |
+ pc.plotEvolution() | |
phi_bar[c][i] = pc.phi_bar | |
else: | |
print(sid + ' not found') | |
diff --git a/python/shear-starter.py b/python/shear-starter.py | |
t@@ -4,15 +4,21 @@ import numpy | |
import sys | |
# launch with: | |
-# $ python shear-starter <DEVICE> <C_PHI> <C_GRAD_P> <SIGMA_0> | |
+# $ python shear-starter.py <DEVICE> <FLUID> <C_PHI> <C_GRAD_P> <SIGMA_0> | |
device = int(sys.argv[1]) | |
-c_phi = float(sys.argv[2]) | |
-c_grad_p = float(sys.argv[3]) | |
-sigma0 = float(sys.argv[4]) | |
+wet = int(sys.argv[2]) | |
+c_phi = float(sys.argv[3]) | |
+c_grad_p = float(sys.argv[4]) | |
+sigma0 = float(sys.argv[5]) | |
#sim = sphere.sim('diffusivity-sigma0=' + str(sigma0) + '-c_phi=' + \ | |
# str(c_phi) + '-c_grad_p=' + str(c_grad_p), fluid=True) | |
+if wet == 1: | |
+ fluid = True | |
+else: | |
+ fluit = False | |
+ | |
sim = sphere.sim('diffusivity-sigma0=' + str(sigma0) +'-c_phi=1.0-c_grad_p=1.0… | |
fluid=True) | |
sim.readlast() | |
t@@ -20,7 +26,7 @@ sim.readlast() | |
sim.sid = 'shear-sigma0=' + str(sigma0) + '-c_phi=' + str(c_phi) + \ | |
'-c_grad_p=' + str(c_grad_p) | |
print(sim.sid) | |
- | |
+sim.fluid = fluid | |
sim.checkerboardColors(nx=6,ny=6,nz=6) | |
sim.cleanup() | |
t@@ -29,7 +35,8 @@ sim.zeroKinematics() | |
sim.shear(1.0/20.0) | |
-sim.initFluid(mu = 17.87e-4, p = 1.0e5, hydrostatic = True) | |
+if fluid: | |
+ sim.initFluid(mu = 17.87e-4, p = 1.0e5, hydrostatic = True) | |
sim.setFluidBottomNoFlow() | |
sim.setFluidTopFixedPressure() | |
sim.setDEMstepsPerCFDstep(10) |