From 3aff388cde1a4927eea520f836e3afa0e7af63f0 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Thu, 9 Oct 2014 09:45:15 -0400 Subject: [PATCH 1/4] MOdified tests/BlobAnalysis.cpp --- tests/BlobAnalysis.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/BlobAnalysis.cpp b/tests/BlobAnalysis.cpp index d1ad2cb3..c89b014a 100644 --- a/tests/BlobAnalysis.cpp +++ b/tests/BlobAnalysis.cpp @@ -342,6 +342,46 @@ 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 Date: Thu, 9 Oct 2014 11:54:02 -0400 Subject: [PATCH 2/4] Fixed pressure avg in tests/BlobAnAnalysis.cpp --- tests/BlobAnalysis.cpp | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/BlobAnalysis.cpp b/tests/BlobAnalysis.cpp index c89b014a..607ff0bd 100644 --- a/tests/BlobAnalysis.cpp +++ b/tests/BlobAnalysis.cpp @@ -344,6 +344,7 @@ int main(int argc, char **argv) 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 ) @@ -923,7 +928,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; @@ -936,15 +950,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; - - 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 From 9fc6249bf5fd38317dd998fb1c5b204f4dd19d97 Mon Sep 17 00:00:00 2001 From: James McClure Date: Thu, 9 Oct 2014 11:59:17 -0400 Subject: [PATCH 3/4] Fixed pressure avg in tests/BlobAnAnalysis.cpp --- tests/BlobAnalysis.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/BlobAnalysis.cpp b/tests/BlobAnalysis.cpp index 607ff0bd..43a8e6ba 100644 --- a/tests/BlobAnalysis.cpp +++ b/tests/BlobAnalysis.cpp @@ -362,8 +362,6 @@ int main(int argc, char **argv) } } } - printf("%s, %f \n",LocalRankFilename, Press(50,50,50)); - sprintf(LocalRankFilename,"%s%s","Phase.",LocalRankString); ReadBinaryFile(LocalRankFilename, Temp, nx*ny*nz); @@ -950,7 +948,6 @@ int main(int argc, char **argv) Gns(3) = Gns(4) = Gns(5) = 0.0; Jwn = Kwn = efawns = 0.0; trJwn = trawn = trRwn = 0.0; - // Write out the "equilibrium" state with a 0.5 % change in saturation" // Always write the largest blob From ad3deac28474762b42c15a5db9f81c5001b73c72 Mon Sep 17 00:00:00 2001 From: James McClure Date: Sat, 11 Oct 2014 18:28:51 -0400 Subject: [PATCH 4/4] Updated tests/BlobAnalysis.cpp --- tests/BlobAnalysis.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/BlobAnalysis.cpp b/tests/BlobAnalysis.cpp index 43a8e6ba..358588c0 100644 --- a/tests/BlobAnalysis.cpp +++ b/tests/BlobAnalysis.cpp @@ -634,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