 |
tRenamed N to F - sphere - GPU-based 3D discrete element method algorithm with … |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 819f1dd8f7de89c262525884dcd25f86bd9eb292 |
|
parent e16de644cf05a50d925c03ad9502f553f8c10680 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Mon, 3 Sep 2012 14:35:35 +0200 |
|
|
|
Renamed N to F |
|
|
|
Diffstat: |
|
M src/contactsearch.cuh | 10 +++++----- |
|
|
|
1 file changed, 5 insertions(+), 5 deletions(-) |
|
--- |
|
diff --git a/src/contactsearch.cuh b/src/contactsearch.cuh |
|
t@@ -83,7 +83,7 @@ __device__ int findDistMod(int3* targetCell, Float3* distmod) |
|
__device__ void findAndProcessContactsInCell(int3 targetCell, |
|
unsigned int idx_a, |
|
Float4 x_a, Float radius_a, |
|
- Float3* N, Float3* T, |
|
+ Float3* F, Float3* T, |
|
Float* es_dot, Float* p, |
|
Float4* dev_x_sorted, |
|
Float* dev_radius_sorted, |
|
t@@ -145,7 +145,7 @@ __device__ void findAndProcessContactsInCell(int3 targetCe… |
|
|
|
// Check for particle overlap |
|
if (delta_ab < 0.0f) { |
|
- contactLinearViscous(N, T, es_dot, p, |
|
+ contactLinearViscous(F, T, es_dot, p, |
|
idx_a, idx_b, |
|
dev_vel_sorted, |
|
dev_angvel_sorted, |
|
t@@ -154,14 +154,14 @@ __device__ void findAndProcessContactsInCell(int3 target… |
|
delta_ab, kappa); |
|
} else if (delta_ab < devC_db) { |
|
// Check wether particle distance satisfies the capillary bond dista… |
|
- capillaryCohesion_exp(N, radius_a, radius_b, delta_ab, |
|
+ capillaryCohesion_exp(F, radius_a, radius_b, delta_ab, |
|
x_ab, x_ab_length, kappa); |
|
} |
|
|
|
// Check wether particles are bonded together |
|
/*if (bonds.x == idx_b || bonds.y == idx_b || |
|
bonds.z == idx_b || bonds.w == idx_b) { |
|
- bondLinear(N, T, es_dot, p, |
|
+ bondLinear(F, T, es_dot, p, |
|
idx_a, idx_b, |
|
dev_x_sorted, dev_vel_sorted, |
|
dev_angvel_sorted, |
|
t@@ -285,7 +285,7 @@ __device__ void findContactsInCell(int3 targetCell, |
|
// Check wether particles are bonded together |
|
/*if (bonds.x == idx_b || bonds.y == idx_b || |
|
bonds.z == idx_b || bonds.w == idx_b) { |
|
- bondLinear(N, T, es_dot, p, |
|
+ bondLinear(F, T, es_dot, p, |
|
idx_a, idx_b, |
|
dev_x_sorted, dev_vel_sorted, |
|
dev_angvel_sorted, |
