tfixed alloc error - sphere - GPU-based 3D discrete element method algorithm wi… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit bac135cd197b4e44448c4e1c0c7af6f2550f5718 | |
parent 44459e56cb40fe60c971b81b3562ef2baf57dcf4 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 14 Jan 2013 13:09:48 +0100 | |
fixed alloc error | |
Diffstat: | |
M src/sphere.cpp | 12 ++++++------ | |
1 file changed, 6 insertions(+), 6 deletions(-) | |
--- | |
diff --git a/src/sphere.cpp b/src/sphere.cpp | |
t@@ -505,17 +505,17 @@ void DEM::forcechains() | |
findOverlaps(ij, delta_n_ij); | |
// Write Asymptote header | |
- cout << "import three; \n size(600);" << endl; | |
+ cout << "import three;\nsize(600);" << endl; | |
// Loop over found contacts, report to stdout | |
unsigned int n, i, j; | |
- std::vector<unsigned int> ijs(1); | |
+ std::vector<unsigned int> ij_pair(2); | |
Float delta_n; | |
for (n=0; n<ij.size(); ++n) { | |
- ijs = ij[n]; | |
- i = ijs[0]; | |
- j = ijs[1]; | |
+ ij_pair = ij[n]; | |
+ i = ij_pair[0]; | |
+ j = ij_pair[1]; | |
delta_n = delta_n_ij[n]; | |
t@@ -531,7 +531,7 @@ void DEM::forcechains() | |
<< k.x[i].z << ")..(" | |
<< k.x[j].x << ',' | |
<< k.x[j].y << ',' | |
- << k.x[j].z << "); \n draw(g);" << endl; | |
+ << k.x[j].z << ");\ndraw(g);" << endl; | |
} | |
} |