tAdded mu_ws and mu_wd zeroing in shear() - sphere - GPU-based 3D discrete elem… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 8f7887e73874905c6326d16096840858bfa50c2f | |
parent 18f1c3b4859a655a666c6e987412d3dae28d50d7 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 27 Nov 2012 12:49:50 +0100 | |
Added mu_ws and mu_wd zeroing in shear() | |
Diffstat: | |
M python/sphere.py | 24 ++++++++++++++++-------- | |
1 file changed, 16 insertions(+), 8 deletions(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -235,7 +235,7 @@ class Spherebin: | |
self.V_b = numpy.fromfile(fh, dtype=numpy.float64, count=… | |
# Wall data | |
- self.nw = numpy.fromfile(fh, dtype=numpy.uint32, count=1) | |
+ self.nw = numpy.fromfile(fh, dtype=numpy.uint32, count=1) | |
self.wmode = numpy.zeros(self.nw, dtype=numpy.int32) | |
self.w_n = numpy.zeros(self.nw*self.nd, dtype=numpy.float64).r… | |
self.w_x = numpy.zeros(self.nw, dtype=numpy.float64) | |
t@@ -637,15 +637,15 @@ class Spherebin: | |
self.angpos = numpy.zeros(self.np*self.nd, dtype=numpy.float64).resha… | |
# Initialize upper wall | |
- self.nw = numpy.array([1], dtype=numpy.uint32) | |
+ self.nw = numpy.ones(1) | |
self.wmode = numpy.array([1]) # devs BC | |
self.w_n = numpy.zeros(self.nw*self.nd, dtype=numpy.float64).reshape(s… | |
self.w_n[0,2] = -1.0 | |
self.w_x = numpy.array([self.L[2]]) | |
self.w_m = numpy.array([self.rho[0] * self.np * math.pi * (cellsize/2.… | |
- self.w_vel = numpy.array([0.0]) | |
- self.w_force = numpy.array([0.0]) | |
- self.w_devs = numpy.array([deviatoric_stress]) | |
+ self.w_vel = numpy.zeros(1) | |
+ self.w_force = numpy.zeros(1) | |
+ self.w_devs = numpy.ones(1) * deviatoric_stress | |
# Adjust grid and upper wall for consolidation under fixed upper wall velo… | |
def uniaxialStrainRate(self, wvel = -0.001, | |
t@@ -733,6 +733,10 @@ class Spherebin: | |
self.gamma_wn[0] = 0.0 | |
self.gamma_wt[0] = 0.0 | |
+ # Set wall friction coefficients to zero | |
+ self.mu_ws[0] = 0.0 | |
+ self.mu_wd[0] = 0.0 | |
+ | |
def initTemporal(self, total, | |
current = 0.0, | |
t@@ -960,16 +964,20 @@ class Spherebin: | |
return porosity_grid | |
- def run(self, verbose=True, hideinputfile=False): | |
+ def run(self, verbose=True, hideinputfile=False, dry=False): | |
""" Execute sphere with target project | |
""" | |
quiet = "" | |
stdout = "" | |
+ dryarg = "" | |
if (verbose == False): | |
- quiet = "-q" | |
+ quiet = "-q " | |
if (hideinputfile == True): | |
stdout = " > /dev/null" | |
- subprocess.call("cd ..; ./sphere_* " + quiet + " input/" + self.sid + … | |
+ if (dry == True): | |
+ dryarg = "--dry " | |
+ | |
+ subprocess.call("cd ..; ./sphere_* " + quiet + dryarg + "input/" + sel… | |
def render(self, | |
method = "pres", |