tAdd additional argument type enforcing - sphere - GPU-based 3D discrete elemen… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 9295e7c5f166270573fd767a9c4ff64080fded03 | |
parent 89a7e711eac82d250f07c91aa8022448bc817a43 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Wed, 20 Dec 2017 17:22:10 -0800 | |
Add additional argument type enforcing | |
Diffstat: | |
M python/sphere.py | 6 +++--- | |
1 file changed, 3 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -227,7 +227,7 @@ class sim: | |
# nw = 1: Uniaxial (also used for shear experiments) | |
# nw = 2: Biaxial | |
# nw = 5: Triaxial | |
- self.nw = numpy.ones(1, dtype=numpy.uint32) * nw | |
+ self.nw = numpy.ones(1, dtype=numpy.uint32) * int(nw) | |
# Wall modes | |
# 0: Fixed | |
t@@ -282,10 +282,10 @@ class sim: | |
self.nb0 = numpy.zeros(1, dtype=numpy.uint32) | |
# Bond tensile strength [Pa] | |
- self.sigma_b = numpy.ones(1, dtype=numpy.uint32) * numpy.infty | |
+ self.sigma_b = numpy.ones(1, dtype=numpy.float64) * numpy.infty | |
# Bond shear strength [Pa] | |
- self.tau_b = numpy.ones(1, dtype=numpy.uint32) * numpy.infty | |
+ self.tau_b = numpy.ones(1, dtype=numpy.float64) * numpy.infty | |
# Bond pairs | |
self.bonds = numpy.zeros((self.nb0[0], 2), dtype=numpy.uint32) |