tchanged to numpy.minimum in E_bond_pot function - 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 38b8cad5880cbf86083ffbc41f3f2b5d771064de
(DIR) parent cb39751b5def0109642e7bb7769cb07863792384
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Tue, 12 Mar 2013 19:43:21 +0100
changed to numpy.minimum in E_bond_pot function
Diffstat:
M python/sphere.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
(DIR) diff --git a/python/sphere.py b/python/sphere.py
t@@ -1042,7 +1042,7 @@ class Spherebin:
elif method == 'bondpot':
if (self.nb0 > 0):
- R_bar = self.lambda_bar * numpy.min(self.radius[self.bonds[:,0]], self.radius[self.bonds[:,1]])
+ R_bar = self.lambda_bar * numpy.minimum(self.radius[self.bonds[:,0]], self.radius[self.bonds[:,1]])
A = numpy.pi * R_bar**2
I = 0.25 * numpy.pi * R_bar**4
J = I*2.0