treturn as scalar - sphere - GPU-based 3D discrete element method algorithm wit… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit b8293f1e95dc5c366c98e0e282e0c7fa1f33d0e4 | |
parent 61a1d8353162cea498b133c390d8a9c3f34adcee | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 22 Jan 2015 09:44:40 +0100 | |
return as scalar | |
Diffstat: | |
M python/sphere.py | 3 ++- | |
1 file changed, 2 insertions(+), 1 deletion(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -3548,7 +3548,8 @@ class sim: | |
:return type: float | |
''' | |
return self.w_sigma0[0] \ | |
- + self.w_sigma0_A*numpy.sin(2.0*numpy.pi*self.time_current) | |
+ + self.w_sigma0_A[0] \ | |
+ *numpy.sin(2.0*numpy.pi*self.time_current[0]) | |
def volume(self, idx): | |
''' |