 |
tdphi should be 0 in first iteration - sphere - GPU-based 3D discrete element m… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 70fa33cbfaee3e864810c6c0cbc93cd929bc72cd |
|
parent 9034f035473763e3754baa35caab5322177d5062 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Mon, 24 Nov 2014 14:52:40 +0100 |
|
|
|
dphi should be 0 in first iteration |
|
|
|
Diffstat: |
|
M src/darcy.cuh | 9 +++++---- |
|
|
|
1 file changed, 5 insertions(+), 4 deletions(-) |
|
--- |
|
diff --git a/src/darcy.cuh b/src/darcy.cuh |
|
t@@ -479,14 +479,15 @@ __global__ void findDarcyPorosities( |
|
//phi = fmin(0.99, fmax(0.01, void_volume/cell_volume)); |
|
//phi = void_volume/cell_volume; |
|
|
|
- /*Float dphi = phi - phi_0; |
|
- if (iteration == 0) |
|
- dphi = 0.0;*/ |
|
+ /*Float dphi = phi - phi_0;*/ |
|
|
|
- const Float dphi = |
|
+ Float dphi = |
|
(1.0 - fmin(phi_0, 0.9))*dot_epsilon_kk*ndem*devC_dt; |
|
//(1.0 - fmin(phi_0,0.99))*dot_epsilon_kk*ndem*devC_dt; |
|
|
|
+ if (iteration == 0) |
|
+ dphi = 0.0; |
|
+ |
|
// report values to stdout for debugging |
|
//printf("%d,%d,%d\tphi = %f dphi = %f\n", x,y,z, phi, dphi); |
|
//printf("%d,%d,%d\tphi = %f dphi = %f v_avg = %f,%f,%f d_avg = %f… |
