tCorrected range error in random number generation - sphere - GPU-based 3D disc… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 3b2d08a037d933e278e3c0caf736feb8f1e54b9b | |
parent 38b8cad5880cbf86083ffbc41f3f2b5d771064de | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 12 Mar 2013 21:12:05 +0100 | |
Corrected range error in random number generation | |
Diffstat: | |
M python/sphere.py | 12 ++++++++++-- | |
1 file changed, 10 insertions(+), 2 deletions(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -101,6 +101,8 @@ class Spherebin: | |
self.lambda_bar = numpy.ones(1, dtype=numpy.float64) | |
self.nb0 = numpy.zeros(1, dtype=numpy.uint32) | |
+ self.sigma_b = numpy.ones(1, dtype=numpy.uint32) * numpy.infty | |
+ self.tau_b = numpy.ones(1, dtype=numpy.uint32) * numpy.infty | |
self.bonds = numpy.zeros((self.nb0, 2), dtype=numpy.uint32) | |
self.bonds_delta_n = numpy.zeros(self.nb0, dtype=numpy.float64) | |
self.bonds_delta_t = numpy.zeros((self.nb0, self.nd), dtype=numpy.floa… | |
t@@ -163,6 +165,8 @@ class Spherebin: | |
self.gamma_wt == other.gamma_wt and\ | |
self.lambda_bar == other.lambda_bar and\ | |
self.nb0 == other.nb0 and\ | |
+ self.sigma_b == other.sigma_b and\ | |
+ self.tau_b == other.tau_b and\ | |
self.bonds == other.bonds and\ | |
self.bonds_delta_n == other.bonds_delta_n and\ | |
self.bonds_delta_t == other.bonds_delta_t and\ | |
t@@ -285,6 +289,8 @@ class Spherebin: | |
# Inter-particle bonds | |
self.lambda_bar = numpy.fromfile(fh, dtype=numpy.float64, count=1) | |
self.nb0 = numpy.fromfile(fh, dtype=numpy.uint32, count=1) | |
+ self.sigma_b = numpy.fromfile(fh, dtype=numpy.float64, count=1) | |
+ self.tau_b = numpy.fromfile(fh, dtype=numpy.float64, count=1) | |
self.bonds = numpy.zeros((self.nb0, 2), dtype=numpy.uint32) | |
for i in range(self.nb0): | |
self.bonds[i,0] = numpy.fromfile(fh, dtype=numpy.uint32, count… | |
t@@ -389,6 +395,8 @@ class Spherebin: | |
fh.write(self.lambda_bar.astype(numpy.float64)) | |
fh.write(self.nb0.astype(numpy.uint32)) | |
+ fh.write(self.sigma_b.astype(numpy.float64)) | |
+ fh.write(self.tau_b.astype(numpy.float64)) | |
for i in range(self.nb0): | |
fh.write(self.bonds[i,0].astype(numpy.uint32)) | |
fh.write(self.bonds[i,1].astype(numpy.uint32)) | |
t@@ -731,7 +739,7 @@ class Spherebin: | |
specified, due to the random selection algorithm. | |
""" | |
- bondparticles = numpy.unique(numpy.random.random_integers(0, high=self… | |
+ bondparticles = numpy.unique(numpy.random.random_integers(0, high=self… | |
if (bondparticles.size % 2 > 0): | |
bondparticles = bondparticles[:-1].copy() | |
bondparticles = bondparticles.reshape(int(bondparticles.size/2), 2).co… | |
t@@ -1238,7 +1246,7 @@ class Spherebin: | |
''' Visualize strike- and dip angles of the strongest force chains in a | |
rose plot. | |
''' | |
- self.writebin() | |
+ self.writebin(verbose=False) | |
subprocess.call("cd .. && ./forcechains -f txt input/" + self.sid + ".… | |