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

refactor TwoPhase analysis to respect multi-mineral convention

Browse Source
This commit is contained in:
James E McClure 2018-08-01 09:12:33 -04:00
parent 04623dddbe
commit 0f6fa3afa7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
analysis/TwoPhase.cpp
View File

@ -394,7 +394,7 @@ void TwoPhase::UpdateMeshValues()
for (j=0; j<Ny; j++){ for (j=0; j<Ny; j++){
for (i=0; i<Nx; i++){ for (i=0; i<Nx; i++){
n = k*Nx*Ny+j*Nx+i; n = k*Nx*Ny+j*Nx+i;
if (Dm->id[n] == 0){ if (!(Dm->id[n] > 0)){
// Solid phase // Solid phase
PhaseID(i,j,k) = 0; PhaseID(i,j,k) = 0;
} }
@ -431,7 +431,7 @@ void TwoPhase::ComputeLocal()
// Compute volume averages // Compute volume averages
for (int p=0;p<8;p++){ for (int p=0;p<8;p++){
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 ){ if ( Dm->id[n] > 0 ){
// 1-D index for this cube corner // 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
@ -624,7 +624,7 @@ void TwoPhase::ComponentAverages()
// Compute volume averages // Compute volume averages
for (int p=0;p<8;p++){ for (int p=0;p<8;p++){
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 ){ if ( Dm->id[n] > 0 ){
// 1-D index for this cube corner // 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