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

tests/TestBlobAnalyze working -- cleaning up

Browse Source
This commit is contained in:
James E McClure 2015-06-06 08:48:35 -04:00
parent 8feae91013
commit c93ee0ed0a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/TwoPhase.h
View File

@ -451,11 +451,10 @@ void TwoPhase::ComputeLocal(){
i = cubeList(0,c); i = cubeList(0,c);
j = cubeList(1,c); j = cubeList(1,c);
k = cubeList(2,c); k = cubeList(2,c);
//...........................................................................
n_nw_pts=n_ns_pts=n_ws_pts=n_nws_pts=n_local_sol_pts=n_local_nws_pts=0; n_nw_pts=n_ns_pts=n_ws_pts=n_nws_pts=n_local_sol_pts=n_local_nws_pts=0;
n_nw_tris=n_ns_tris=n_ws_tris=n_nws_seg=n_local_sol_tris=0; n_nw_tris=n_ns_tris=n_ws_tris=n_nws_seg=n_local_sol_tris=0;
//........................................................................... //...........................................................................
//...........................................................................
// Compute volume averages // Compute volume averages
for (int p=0;p<8;p++){ for (int p=0;p<8;p++){
@ -556,11 +555,14 @@ void TwoPhase::ComputeLocalBlob(){
// get the maximum label locally -- then compute number of global blobs // get the maximum label locally -- then compute number of global blobs
label=0; label=0;
nblobs_global = 0; nblobs_global = 0;
for (n=0; n<Nx*Ny*Nz; n++){ /* for (n=0; n<Nx*Ny*Nz; n++){
if (label < BlobLabel(n)) label = BlobLabel(n); if (label < BlobLabel(n)) label = BlobLabel(n);
} }
MPI_Allreduce(&label,&nblobs_global,1,MPI_INT,MPI_MAX,Dm.Comm); MPI_Allreduce(&label,&nblobs_global,1,MPI_INT,MPI_MAX,Dm.Comm);
nblobs_global+=1; nblobs_global+=1;
*/
nblobs_global = ComputeGlobalBlobIDs(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,
Phase,SDs,vF,vS,BlobLabel);
if (Dm.rank==0) printf("Number of blobs is %i \n",nblobs_global); if (Dm.rank==0) printf("Number of blobs is %i \n",nblobs_global);
//BlobAverages.Set(nblobs_global); //BlobAverages.Set(nblobs_global);

9
tests/TestBlobAnalyze.cpp
View File

@ -234,7 +234,6 @@ int main(int argc, char **argv)
double vF,vS; double vF,vS;
vF = vS = 0.0; vF = vS = 0.0;
double beta = 0.95; double beta = 0.95;
if (rank==0) printf("initializing the system \n"); if (rank==0) printf("initializing the system \n");
Averages.SetupCubes(Dm); Averages.SetupCubes(Dm);
@ -243,10 +242,10 @@ int main(int argc, char **argv)
Averages.UpdateMeshValues(); Averages.UpdateMeshValues();
Dm.CommunicateMeshHalo(Averages.Phase); Dm.CommunicateMeshHalo(Averages.Phase);
if (rank==0) printf("computing blobs \n"); // if (rank==0) printf("computing blobs \n");
int nblobs_global = ComputeGlobalBlobIDs(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info, // int nblobs_global = ComputeGlobalBlobIDs(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,
Averages.Phase,Averages.SDs,vF,vS,Averages.BlobLabel); // Averages.Phase,Averages.SDs,vF,vS,Averages.BlobLabel);
if (Dm.rank==0) printf("Number of blobs is %i \n",nblobs_global); // if (Dm.rank==0) printf("Number of blobs is %i \n",nblobs_global);
if (rank==0) printf("computing local averages \n"); if (rank==0) printf("computing local averages \n");
Averages.ComputeLocalBlob(); Averages.ComputeLocalBlob();