 |
tset dphi after div_v_p - sphere - GPU-based 3D discrete element method algorit… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit e3eab516b613460f62e4c4edc96b02e84ff92503 |
|
parent 0d909bc75354f830c84bc8ae75c89976d79e121b |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Mon, 24 Nov 2014 14:35:30 +0100 |
|
|
|
set dphi after div_v_p |
|
|
|
Diffstat: |
|
M src/darcy.cuh | 12 ++++++------ |
|
|
|
1 file changed, 6 insertions(+), 6 deletions(-) |
|
--- |
|
diff --git a/src/darcy.cuh b/src/darcy.cuh |
|
t@@ -474,16 +474,16 @@ __global__ void findDarcyPorosities( |
|
//} |
|
|
|
// Make sure that the porosity is in the interval [0.0;1.0] |
|
- phi = fmin(0.9, fmax(0.1, void_volume/cell_volume)); |
|
- //phi = fmin(0.99, fmax(0.01, void_volume/cell_volume)); |
|
+ //phi = fmin(0.9, fmax(0.1, void_volume/cell_volume)); |
|
+ phi = fmin(0.99, fmax(0.01, void_volume/cell_volume)); |
|
//phi = void_volume/cell_volume; |
|
|
|
- Float dphi = phi - phi_0; |
|
+ /*Float dphi = phi - phi_0; |
|
if (iteration == 0) |
|
- dphi = 0.0; |
|
+ dphi = 0.0;*/ |
|
|
|
- //const Float dphi = |
|
- //(1.0 - fmin(phi_0,0.99))*dot_epsilon_kk*ndem*devC_dt; |
|
+ const Float dphi = |
|
+ (1.0 - fmin(phi_0,0.99))*dot_epsilon_kk*ndem*devC_dt; |
|
|
|
// report values to stdout for debugging |
|
//printf("%d,%d,%d\tphi = %f dphi = %f\n", x,y,z, phi, dphi); |
