tadd wall shear stress parameter - 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 d409f5cbe71dd52da3f10a388d712e9957a41ad4
(DIR) parent e040d05d88a188d6c3d82df54de032b72b5b5ca8
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Wed, 14 Jan 2015 10:00:45 +0100
add wall shear stress parameter
Diffstat:
M python/sphere.py | 9 +++++++++
1 file changed, 9 insertions(+), 0 deletions(-)
---
(DIR) diff --git a/python/sphere.py b/python/sphere.py
t@@ -250,6 +250,9 @@ class sim:
# Wall stress modulation frequency [Hz]
self.w_sigma0_f = numpy.zeros(1, dtype=numpy.float64)
+ # Wall shear stress, enforced when wmode == 3
+ self.w_tau = numpy.zeros(1, dtype=numpy.float64)
+
## Bond parameters
# Radius multiplier to the parallel-bond radii
self.lambda_bar = numpy.ones(1, dtype=numpy.float64)
t@@ -561,6 +564,9 @@ class sim:
elif (self.w_sigma0_f != other.w_sigma0_f):
print(52)
return 52
+ elif (self.w_tau != other.w_tau):
+ print(52.5)
+ return 52.5
elif (self.gamma_wn != other.gamma_wn):
print(53)
return 53
t@@ -1034,6 +1040,8 @@ class sim:
if sigma0mod:
self.w_sigma0_A = numpy.fromfile(fh, dtype=numpy.float64, count=1)
self.w_sigma0_f = numpy.fromfile(fh, dtype=numpy.float64, count=1)
+ if self.version >= 2.1:
+ self.w_tau = numpy.fromfile(fh, dtype=numpy.float64, count=1)
if bonds:
# Inter-particle bonds
t@@ -1322,6 +1330,7 @@ class sim:
fh.write(self.w_sigma0[i].astype(numpy.float64))
fh.write(self.w_sigma0_A.astype(numpy.float64))
fh.write(self.w_sigma0_f.astype(numpy.float64))
+ fh.write(self.w_tau.astype(numpy.float64))
fh.write(self.lambda_bar.astype(numpy.float64))
fh.write(self.nb0.astype(numpy.uint32))