From b6fbcd5770bb1323970cbe4bff8b950b33a3b5fc Mon Sep 17 00:00:00 2001
From: James E McClure <mcclurej@vt.edu>
Date: Tue, 1 Sep 2015 21:15:30 -0400
Subject: [PATCH] changes to common/TwoPhase.cpp - changed out MPI_Allreduce
 for MPI_Reduce, removed erroneous references to MPI_COMM_WORLD

---
 common/TwoPhase.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/TwoPhase.cpp b/common/TwoPhase.cpp
index 80b1404e..65f34f6c 100644
--- a/common/TwoPhase.cpp
+++ b/common/TwoPhase.cpp
@@ -710,9 +710,10 @@ void TwoPhase::ComponentAverages()
 		for (int idx=0; idx<BLOB_AVG_COUNT; idx++) ComponentAverages_NWP(idx,b)=RecvBuffer(idx);
 	}
 	*/
-	MPI_Barrier(MPI_COMM_WORLD);
-	MPI_Allreduce(&ComponentAverages_NWP(0,0),&RecvBuffer(0,0),BLOB_AVG_COUNT*NumberComponents_NWP,
-					MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
+	MPI_Barrier(Dm.Comm);
+//	MPI_Allreduce(&ComponentAverages_NWP(0,0),&RecvBuffer(0,0),BLOB_AVG_COUNT*NumberComponents_NWP,
+//					MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
+	MPI_Reduce(&ComponentAverages_NWP(0,b),&RecvBuffer(0),BLOB_AVG_COUNT,MPI_DOUBLE,MPI_SUM,0,Dm.Comm);
 
 	for (int b=0; b<NumberComponents_NWP; b++){
 		for (int idx=0; idx<BLOB_AVG_COUNT; idx++) ComponentAverages_NWP(idx,b)=RecvBuffer(idx,b);
@@ -798,8 +799,10 @@ void TwoPhase::ComponentAverages()
 
 	// reduce the wetting phase averages
 	for (int b=0; b<NumberComponents_WP; b++){
-		MPI_Barrier(MPI_COMM_WORLD);
-		MPI_Allreduce(&ComponentAverages_WP(0,b),&RecvBuffer(0),BLOB_AVG_COUNT,MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
+		MPI_Barrier(Dm.Comm);
+//		MPI_Allreduce(&ComponentAverages_WP(0,b),&RecvBuffer(0),BLOB_AVG_COUNT,MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
+		MPI_Reduce(&ComponentAverages_WP(0,b),&RecvBuffer(0),BLOB_AVG_COUNT,MPI_DOUBLE,MPI_SUM,0,Dm.Comm);
+
 		for (int idx=0; idx<BLOB_AVG_COUNT; idx++) ComponentAverages_WP(idx,b)=RecvBuffer(idx);
 	}