From 5d03313a0be80bb22e6c500d30214a1846cc8f5f Mon Sep 17 00:00:00 2001
From: James E McClure <mcclurej@vt.edu>
Date: Sat, 6 Aug 2016 11:43:12 -0400
Subject: [PATCH] Pore size histogram working in lbpm_morph_pp

---
 tests/lbpm_morph_pp.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/lbpm_morph_pp.cpp b/tests/lbpm_morph_pp.cpp
index 2ff96c9f..533eb5ef 100644
--- a/tests/lbpm_morph_pp.cpp
+++ b/tests/lbpm_morph_pp.cpp
@@ -167,7 +167,7 @@ int main(int argc, char **argv)
 	// Generate a histogram of pore size distribution
 	// Get all local pore sizes (local maxima)
 	if (rank==0) printf("Generating a histogram of pore sizes \n");
-	int NumBins=100;
+	int NumBins=30;
 	int *BinCounts;
 	BinCounts = new int [NumBins];
 	int *GlobalHistogram;
@@ -202,6 +202,7 @@ int main(int argc, char **argv)
 		}
 	}
 	// Compute min and max poresize
+	if (rank==0) printf("    computing local minimum and maximum... \n");
 	MinPoreSize=MaxPoreSize=PoreSize[0];
 	for (int idx=0; idx<PoreSize.size(); idx++){
 		if (PoreSize[idx] < MinPoreSize) MinPoreSize=PoreSize[idx];
@@ -213,19 +214,25 @@ int main(int argc, char **argv)
 	MPI_Allreduce(&MaxPoreSize,&GlobalValue,1,MPI_DOUBLE,MPI_MAX,comm);
 	MaxPoreSize=GlobalValue;
 	// Generate histogram counts
+	if (rank==0) printf("    generating local bin counts... \n");
 	BinWidth=(MaxPoreSize-MinPoreSize)/NumBins;
 	for (int idx=0; idx<PoreSize.size(); idx++){
 		double value = PoreSize[idx];
 		int myBin = int((value-MinPoreSize)/BinWidth);
 		BinCounts[myBin]++;
 	}
+	if (rank==0) printf("    summing global bin counts... \n");
 	// Reduce the counts to generate the fhistogram at rank=0
-	MPI_Reduce(&BinCounts,&GlobalHistogram,NumBins,MPI_INT,MPI_SUM,0,comm);
+	MPI_Reduce(BinCounts,GlobalHistogram,NumBins,MPI_INT,MPI_SUM,0,comm);
 
+	FILE *PORESIZE;
 	if (rank==0){
-		FILE *PORESIZE=fopen("PoreSize.hist","w");
+		PORESIZE=fopen("PoreSize.hist","w");
+		printf("    writing PoreSize.hist \n");
 		for (int idx=0; idx<NumBins; idx++){
-			fprintf(PORESIZE,"%i %f\n",GlobalHistogram[idx],MinPoreSize+idx*BinWidth);
+		  double BinCenter=MinPoreSize+idx*BinWidth;
+		  int Count=GlobalHistogram[idx];
+			fprintf(PORESIZE,"%i %f\n",Count,BinCenter);
 		}
 		fclose(PORESIZE);
 	}