diff --git a/tests/BlobAnalysis.cpp b/tests/BlobAnalysis.cpp index d1ad2cb3..358588c0 100644 --- a/tests/BlobAnalysis.cpp +++ b/tests/BlobAnalysis.cpp @@ -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 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