From 7133248c68a10380ebd992ab6f4c1288328c9bb9 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Mon, 13 Jul 2015 13:24:06 -0400 Subject: [PATCH] Working on component label halo exchange bug --- common/TwoPhase.h | 4 ++-- tests/lbpm_color_simulator.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/TwoPhase.h b/common/TwoPhase.h index 6d8a5c27..4ae58e02 100644 --- a/common/TwoPhase.h +++ b/common/TwoPhase.h @@ -553,8 +553,8 @@ void TwoPhase::ComponentAverages(){ int cube[8][3] = {{0,0,0},{1,0,0},{0,1,0},{1,1,0},{0,0,1},{1,0,1},{0,1,1},{1,1,1}}; - NumberComponents_WP = ComputeGlobalPhaseComponent(Nx-2,Ny-2,Nz-2,Dm.rank_info,PhaseID,1,Label_WP); - NumberComponents_NWP = ComputeGlobalPhaseComponent(Nx-2,Ny-2,Nz-2,Dm.rank_info,PhaseID,1,Label_NWP); + NumberComponents_WP = ComputeGlobalPhaseComponent(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,PhaseID,2,Label_WP); + NumberComponents_NWP = ComputeGlobalPhaseComponent(Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,Dm.rank_info,PhaseID,1,Label_NWP); ComponentAverages_WP.resize(BLOB_AVG_COUNT,NumberComponents_WP); ComponentAverages_NWP.resize(BLOB_AVG_COUNT,NumberComponents_NWP); diff --git a/tests/lbpm_color_simulator.cpp b/tests/lbpm_color_simulator.cpp index 1926dcca..f593a7c1 100644 --- a/tests/lbpm_color_simulator.cpp +++ b/tests/lbpm_color_simulator.cpp @@ -725,7 +725,6 @@ int main(int argc, char **argv) Averages.Initialize(); Averages.ComponentAverages(); Averages.PrintComponents(timestep); - //.................................................................... }