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

updated TestBlobAnalyze

Browse Source
This commit is contained in:
James E McClure
2015-06-05 16:04:17 -04:00
parent 0ce30b1440
commit e268205481
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/TestBlobAnalyze.cpp
View File

@@ -166,6 +166,19 @@ int main(int argc, char **argv)
Nx = nx+2;
Ny = ny+2;
Nz = nz+2;
if (rank == 0) cout << "Domain set." << endl;
//.......................................................................
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;
Dm.id[n] = 1;
}
}
}
//.......................................................................
Dm.CommInit(MPI_COMM_WORLD); // Initialize communications for domains
//.......................................................................
// Read in sphere pack (initialize the non-wetting phase as inside of spheres)
if (rank==1) printf("nspheres =%i \n",nspheres);
//.......................................................................
@@ -185,20 +198,6 @@ int main(int argc, char **argv)
MPI_Bcast(rad,nspheres,MPI_DOUBLE,0,MPI_COMM_WORLD);
//...........................................................................
MPI_Barrier(MPI_COMM_WORLD);
if (rank == 0) cout << "Domain set." << endl;
//.......................................................................
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;
Dm.id[n] = 1;
}
}
}
//.......................................................................
Dm.CommInit(MPI_COMM_WORLD); // Initialize communications for domains
//.......................................................................
//.......................................................................
SignedDistance(Averages.Phase.get(),nspheres,cx,cy,cz,rad,Lx,Ly,Lz,Nx,Ny,Nz,
Dm.iproc,Dm.jproc,Dm.kproc,Dm.nprocx,Dm.nprocy,Dm.nprocz);
@@ -231,6 +230,13 @@ int main(int argc, char **argv)
}
}
double vF,vS;
vF = vS = 0.0;
nblobs_global = ComputeGlobalBlobIDs(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,
Averages.Phase,Averages.SDs,vF,vS,Averages.BlobLabel);
if (Dm.rank==0) printf("Number of blobs is %i \n",nblobs_global);
if (rank==0) printf("Computing averages \n");
double beta = 0.95;
Averages.SetupCubes(Dm);