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

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James E McClure 2014-10-15 14:27:02 -04:00
commit a3bdeb504f
1 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
tests/BlobAnalysis.cpp
View File

@ -342,6 +342,47 @@ int main(int argc, char **argv)
sprintf(LocalRankFilename,"%s%s","Restart.",LocalRankString);
ReadFromRank(LocalRankFilename,Phase,Press,Vel_x,Vel_y,Vel_z,nx,ny,nz,iproc,jproc,kproc);
sprintf(LocalRankFilename,"%s%s","Pressure.",LocalRankString);
ReadBinaryFile(LocalRankFilename, Temp, nx*ny*nz);
for (k=1; k<nz-1; k++){
for (j=1; j<ny-1; j++){
for (i=1; i<nx-1; i++){
//........................................................................
n = k*nx*ny+j*nx+i;
//........................................................................
iglobal = iproc*(nx-2)+i;
jglobal = jproc*(ny-2)+j;
kglobal = kproc*(nz-2)+k;
//........................................................................
Press(iglobal,jglobal,kglobal) = Temp[n];
//........................................................................
}
}
}
sprintf(LocalRankFilename,"%s%s","Phase.",LocalRankString);
ReadBinaryFile(LocalRankFilename, Temp, nx*ny*nz);
for (k=1; k<nz-1; k++){
for (j=1; j<ny-1; j++){
for (i=1; i<nx-1; i++){
//........................................................................
n = k*nx*ny+j*nx+i;
//........................................................................
iglobal = iproc*(nx-2)+i;
jglobal = jproc*(ny-2)+j;
kglobal = kproc*(nz-2)+k;
//........................................................................
Phase(iglobal,jglobal,kglobal) = Temp[n];
//........................................................................
}
}
}
}
}
}
@ -593,7 +634,7 @@ int main(int argc, char **argv)
DoubleArray BlobAverages(NUM_AVERAGES,nblobs);
// Map the signed distance for the analysis
// for (i=0; i<Nx*Ny*Nz; i++) SignDist.data[i] -= (1.0);
for (i=0; i<Nx*Ny*Nz; i++) SignDist.data[i] -= (1.0);
// Compute the porosity
porosity=0.0;
@ -669,7 +710,7 @@ int main(int argc, char **argv)
Gns(3) = Gns(4) = Gns(5) = 0.0;
Jwn = Kwn = efawns = 0.0;
trJwn = trawn = trRwn = 0.0;
for (c=start;c<finish;c++){
// Get cube from the list
i = blobs(0,c);
@ -679,6 +720,8 @@ int main(int argc, char **argv)
// Use the cube to compute volume averages
for (p=0;p<8;p++){
if ( SignDist(i+cube[p][0],j+cube[p][1],k+cube[p][2]) > 0 ){
n = i+cube[p][0] + Nx*(j+cube[p][1]) + Nx*Ny*(k+cube[p][2]);
// Compute the non-wetting phase volume contribution
if ( Phase(i+cube[p][0],j+cube[p][1],k+cube[p][2]) > 0 )
@ -883,7 +926,16 @@ int main(int argc, char **argv)
fprintf(BLOBLOG,"\n");
}
fclose(BLOBLOG);
double iVol = 1.0/Nx/Ny/Nz;
sw = 1.0;
// Compute the Sauter mean grain diamter
double D = 6.0*Nx*Ny*Nz*(1.0-porosity) / As;
double pw,pn,pc,awnD,ansD,awsD,JwnD,trJwnD,lwnsDD,cwns;
pw = paw/vol_w;
printf("paw = %f \n", paw/vol_w);
printf("vol_w = %f \n", vol_w);
printf("-----------------------------------------------\n");
vol_n = nwp_volume = 0.0;
pan = 0.0;
@ -897,15 +949,6 @@ int main(int argc, char **argv)
Jwn = Kwn = efawns = 0.0;
trJwn = trawn = trRwn = 0.0;
double iVol = 1.0/Nx/Ny/Nz;
sw = 1.0;
// Compute the Sauter mean grain diamter
double D = 6.0*Nx*Ny*Nz*(1.0-porosity) / As;
double pw,pn,pc,awnD,ansD,awsD,JwnD,trJwnD,lwnsDD,cwns;
pw = paw/vol_w;
printf("paw = %f \n", paw);
printf("vol_w = %f \n", vol_w);
// Write out the "equilibrium" state with a 0.5 % change in saturation"
// Always write the largest blob
// sw, pw, pn, pc*D/gamma, awn*D, aws*D, ans*D,lwns*D*D, Jwn*D, trJwn*D, cwns, nblobs