OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up TwoPhase.h

Browse Source
This commit is contained in:
James E McClure 2015-06-26 19:56:11 -04:00
parent 68a59e8ea3
commit b2c2b8d73a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/TwoPhase.h
View File

@ -468,10 +468,9 @@ void TwoPhase::ComputeLocal(){
//........................................................................... //...........................................................................
// Compute volume averages // Compute volume averages
for (int p=0;p<8;p++){ for (int p=0;p<8;p++){
int np_cube = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny;
if ( Dm.id[np_cube] != 0 ){
// 1-D index for this cube corner
n = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny; n = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny;
if ( Dm.id[n] != 0 ){
// 1-D index for this cube corner
// compute the norm of the gradient of the phase indicator field // compute the norm of the gradient of the phase indicator field
// Compute the non-wetting phase volume contribution // Compute the non-wetting phase volume contribution
if ( Phase(i+cube[p][0],j+cube[p][1],k+cube[p][2]) > 0 ){ if ( Phase(i+cube[p][0],j+cube[p][1],k+cube[p][2]) > 0 ){
@ -612,10 +611,9 @@ void TwoPhase::ComputeLocalBlob(){
//........................................................................... //...........................................................................
// Compute volume averages // Compute volume averages
for (int p=0;p<8;p++){ for (int p=0;p<8;p++){
int np_cube = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny;
if ( Dm.id[np_cube] != 0 ){
// 1-D index for this cube corner
n = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny; n = i+cube[p][0] + (j+cube[p][1])*Nx + (k+cube[p][2])*Nx*Ny;
if ( Dm.id[n] != 0 ){
// 1-D index for this cube corner
// compute the norm of the gradient of the phase indicator field // compute the norm of the gradient of the phase indicator field
// Compute the non-wetting phase volume contribution // Compute the non-wetting phase volume contribution
if ( Phase(i+cube[p][0],j+cube[p][1],k+cube[p][2]) > 0 ){ if ( Phase(i+cube[p][0],j+cube[p][1],k+cube[p][2]) > 0 ){