 |
tfinished model A+B implementation, untested - sphere - GPU-based 3D discrete e… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 69299cc0846c266b5c121ed357f0a85d50217235 |
|
parent d60e849d7de2323527f54740877100cfa40ad7ee |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Tue, 20 May 2014 10:06:14 +0200 |
|
|
|
finished model A+B implementation, untested |
|
|
|
Diffstat: |
|
M src/navierstokes.cuh | 9 +++++---- |
|
|
|
1 file changed, 5 insertions(+), 4 deletions(-) |
|
--- |
|
diff --git a/src/navierstokes.cuh b/src/navierstokes.cuh |
|
t@@ -2429,8 +2429,7 @@ __global__ void updateNSvelocityPressure( |
|
const Float p_old = dev_ns_p[cellidx]; |
|
const Float epsilon = dev_ns_epsilon[cellidx]; |
|
const Float3 v_p = dev_ns_v_p[cellidx]; |
|
- //const Float phi = dev_ns_phi[cellidx]; |
|
- const Float dphi = dev_ns_dphi[cellidx]; |
|
+ //const Float dphi = dev_ns_dphi[cellidx]; |
|
|
|
// New pressure |
|
Float p = beta*p_old + epsilon; |
|
t@@ -2445,8 +2444,10 @@ __global__ void updateNSvelocityPressure( |
|
#endif |
|
|
|
#ifdef MODEL_B |
|
- //Float3 v = v_p - ndem*devC_dt/(devC_params.rho_f*phi)*grad_epsilon; |
|
- Float3 v = v_p - ndem*devC_dt/(devC_params.rho_f*dphi)*grad_epsilon; |
|
+ __syncthreads(); |
|
+ const Float phi = dev_ns_phi[cellidx]; |
|
+ Float3 v = v_p - ndem*devC_dt/(devC_params.rho_f*phi)*grad_epsilon; |
|
+ //Float3 v = v_p - ndem*devC_dt/(devC_params.rho_f*dphi)*grad_epsilon; |
|
#endif |
|
|
|
// Print values for debugging |
