From c93ee0ed0a1552ae65674e0b409bd0cc1a09f632 Mon Sep 17 00:00:00 2001
From: James E McClure <mcclurej@vt.edu>
Date: Sat, 6 Jun 2015 08:48:35 -0400
Subject: [PATCH] tests/TestBlobAnalyze working -- cleaning up

---
 common/TwoPhase.h         | 8 +++++---
 tests/TestBlobAnalyze.cpp | 9 ++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/common/TwoPhase.h b/common/TwoPhase.h
index 3064f074..a0c8a508 100644
--- a/common/TwoPhase.h
+++ b/common/TwoPhase.h
@@ -451,11 +451,10 @@ void TwoPhase::ComputeLocal(){
 		i = cubeList(0,c);
 		j = cubeList(1,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_tris=n_ns_tris=n_ws_tris=n_nws_seg=n_local_sol_tris=0;
 		//...........................................................................
-		//...........................................................................
 		// Compute volume averages
 		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
 	label=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);
 	}
 	MPI_Allreduce(&label,&nblobs_global,1,MPI_INT,MPI_MAX,Dm.Comm);
 	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);
 
 	//BlobAverages.Set(nblobs_global);
diff --git a/tests/TestBlobAnalyze.cpp b/tests/TestBlobAnalyze.cpp
index e305f7f0..135f3561 100644
--- a/tests/TestBlobAnalyze.cpp
+++ b/tests/TestBlobAnalyze.cpp
@@ -234,7 +234,6 @@ int main(int argc, char **argv)
 	double vF,vS;
 	vF = vS = 0.0;
 
-
     double beta = 0.95;
 	if (rank==0) printf("initializing the system \n");
     Averages.SetupCubes(Dm);
@@ -243,10 +242,10 @@ int main(int argc, char **argv)
     Averages.UpdateMeshValues();
     Dm.CommunicateMeshHalo(Averages.Phase);
 
-	if (rank==0) printf("computing blobs \n");
-    int 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 blobs \n");
+//    int 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 local averages  \n");
     Averages.ComputeLocalBlob();