 |
tfix contact plot - sphere - GPU-based 3D discrete element method algorithm wit… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 5492bfc15a70a98b8d169223471d474be5322c63 |
|
parent dad3ebdd69aadb6b7b69421f02dd11a1c573d0e3 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Thu, 9 Apr 2015 16:21:44 +0200 |
|
|
|
fix contact plot |
|
|
|
Diffstat: |
|
M python/sphere.py | 20 +++++++++++++------- |
|
|
|
1 file changed, 13 insertions(+), 7 deletions(-) |
|
--- |
|
diff --git a/python/sphere.py b/python/sphere.py |
|
t@@ -5239,7 +5239,8 @@ 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('contacts-tmp.txt', skiprows=1) |
|
+ data = numpy.loadtxt('contacttest.txt', skiprows=1) |
|
|
|
# find the max. value of the normal force |
|
f_n_max = numpy.amax(data[:,6]) |
|
t@@ -5257,9 +5258,12 @@ class sim: |
|
|
|
# loop through these contacts and find the strike and dip of the |
|
# contacts |
|
- strikelist = [] # strike direction of the normal vector, [0:360[ |
|
- diplist = [] # dip of the normal vector, [0:90] |
|
+ |
|
+ # strike direction of the normal vector, [0:360[ |
|
+ strikelist = numpy.empty(len(I[0])) |
|
+ diplist = numpy.empty(len(I[0])) # dip of the normal vector, [0:90] |
|
forcemagnitude = data[I,6] |
|
+ j = 0 |
|
for i in I[0]: |
|
|
|
x1 = data[i,0] |
|
t@@ -5283,17 +5287,19 @@ class sim: |
|
dhoriz = numpy.sqrt(dx**2 + dy**2) |
|
|
|
# Find dip angle |
|
- diplist.append(numpy.degrees(numpy.arctan((zupper - zlower)/dhoriz… |
|
+ diplist[j] = numpy.degrees(numpy.arctan((zupper - zlower)/dhoriz)) |
|
|
|
# Find strike angle |
|
if ylower >= yupper: # in first two quadrants |
|
- strikelist.append(numpy.arccos(dx/dhoriz)) |
|
+ strikelist[j] = numpy.arccos(dx/dhoriz) |
|
else : |
|
- strikelist.append(2.0*numpy.pi - numpy.arccos(dx/dhoriz)) |
|
+ strikelist[j] = 2.0*numpy.pi - numpy.arccos(dx/dhoriz) |
|
+ |
|
+ j += 1 |
|
|
|
fig = plt.figure(figsize=figsize) |
|
ax = plt.subplot(111, polar=True, axisbg='white') |
|
- cs = ax.scatter(strikelist, diplist, marker='o', |
|
+ cs = ax.scatter(strikelist, 90. - diplist, marker='o', |
|
c=forcemagnitude, |
|
s=forcemagnitude/f_n_max*40., |
|
alpha=alpha, |
