 |
tdisable test data - sphere - GPU-based 3D discrete element method algorithm wi… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit c17f6ce2b470990a6183b61a7d8855d0e3debcb9 |
|
parent 5492bfc15a70a98b8d169223471d474be5322c63 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Thu, 9 Apr 2015 16:22:03 +0200 |
|
|
|
disable test data |
|
|
|
Diffstat: |
|
M python/sphere.py | 3 +-- |
|
|
|
1 file changed, 1 insertion(+), 2 deletions(-) |
|
--- |
|
diff --git a/python/sphere.py b/python/sphere.py |
|
t@@ -5239,8 +5239,7 @@ class sim: |
|
+ ".bin > python/contacts-tmp.txt", shell=True) |
|
|
|
# data will have the shape (numcontacts, 7) |
|
- #data = numpy.loadtxt('contacts-tmp.txt', skiprows=1) |
|
- data = numpy.loadtxt('contacttest.txt', skiprows=1) |
|
+ data = numpy.loadtxt('contacts-tmp.txt', skiprows=1) |
|
|
|
# find the max. value of the normal force |
|
f_n_max = numpy.amax(data[:,6]) |
