tshearmodel=2 now uses contactLinear - sphere - GPU-based 3D discrete element m… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 0531e489b13785c47cc32ec30d5f2852f02b88b1 | |
parent 1c66cd7f6edbaaa728ece1a304f05d83e720b3d6 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 25 Sep 2012 09:17:04 +0200 | |
shearmodel=2 now uses contactLinear | |
Diffstat: | |
M src/contactsearch.cuh | 14 +++++++------- | |
1 file changed, 7 insertions(+), 7 deletions(-) | |
--- | |
diff --git a/src/contactsearch.cuh b/src/contactsearch.cuh | |
t@@ -411,9 +411,9 @@ __global__ void interact(unsigned int* dev_gridParticleInd… | |
Float delta_n, x_ab_length, radius_b; | |
Float3 x_ab; | |
Float4 x_b, distmod; | |
- //Float4 vel_a = dev_vel_sorted[idx_a]; | |
- //Float4 angvel4_a = dev_angvel_sorted[idx_a]; | |
- //Float3 angvel_a = MAKE_FLOAT3(angvel4_a.x, angvel4_a.y, angvel4_a.z); | |
+ Float4 vel_a = dev_vel_sorted[idx_a]; | |
+ Float4 angvel4_a = dev_angvel_sorted[idx_a]; | |
+ Float3 angvel_a = MAKE_FLOAT3(angvel4_a.x, angvel4_a.y, angvel4_a.z); | |
// Loop over all possible contacts, and remove contacts | |
// that no longer are valid (delta_n > 0.0) | |
t@@ -439,14 +439,14 @@ __global__ void interact(unsigned int* dev_gridParticleI… | |
// Process collision if the particles are overlapping | |
if (delta_n < 0.0f) { | |
- contactLinearViscous(&F, &T, &es_dot, &p, | |
+ /*contactLinearViscous(&F, &T, &es_dot, &p, | |
idx_a_orig, idx_b_orig, | |
dev_vel, | |
dev_angvel, | |
radius_a, radius_b, | |
x_ab, x_ab_length, | |
- delta_n, devC_kappa); | |
- /*contactLinear(&F, &T, &es_dot, &p, | |
+ delta_n, devC_kappa);*/ | |
+ contactLinear(&F, &T, &es_dot, &p, | |
idx_a_orig, | |
idx_b_orig, | |
vel_a, | |
t@@ -456,7 +456,7 @@ __global__ void interact(unsigned int* dev_gridParticleInd… | |
radius_a, radius_b, | |
x_ab, x_ab_length, | |
delta_n, dev_delta_t, | |
- mempos);*/ | |
+ mempos); | |
} else { | |
__syncthreads(); | |
// Remove this contact (there is no particle with index=np) |