diff --git a/common/Domain.h b/common/Domain.h index b5c39be6..65c07da3 100755 --- a/common/Domain.h +++ b/common/Domain.h @@ -34,7 +34,6 @@ struct Domain{ BlobLabel.resize(Nx,Ny,Nz); BlobGraph.resize(18,MAX_BLOB_COUNT,MAX_BLOB_COUNT); BoundaryCondition = BC; - rank_info = RankInfoStruct(rank,nprocx,nprocy,nprocz); } ~Domain(); @@ -45,7 +44,6 @@ struct Domain{ double Lx,Ly,Lz,Volume; int rank; int BoundaryCondition; - RankInfoStruct rank_info; MPI_Group Group; // Group of processors associated with this domain MPI_Comm Comm; // MPI Communicator for this domain @@ -803,8 +801,8 @@ inline void SSO(DoubleArray &Distance, char *ID, Domain &Dm, int timesteps){ for (q=0; q fillData(Dm.rank_info,Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,1,1,1,0,1); + const RankInfoStruct rank_info(rank,nprocx,nprocy,nprocz); + fillHalo fillData(rank_info,Dm.Nx-2,Dm.Ny-2,Dm.Nz-2,1,1,1,0,1); int count = 0; while (count < timesteps){ diff --git a/tests/TestSegDist.cpp b/tests/TestSegDist.cpp index 579545c5..094c0b9c 100644 --- a/tests/TestSegDist.cpp +++ b/tests/TestSegDist.cpp @@ -44,6 +44,7 @@ int main(int argc, char **argv) // Get the rank info Domain Dm(nx,ny,nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BC); + nx+=2; ny+=2; nz+=2; int count = 0; diff --git a/tests/TestTwoPhase.cpp b/tests/TestTwoPhase.cpp index 387e4b1e..da673ec5 100644 --- a/tests/TestTwoPhase.cpp +++ b/tests/TestTwoPhase.cpp @@ -106,7 +106,6 @@ int main(int argc, char **argv) Averages.PrintAll(timestep); //.................................................................... - if (rank==0){ FILE *PHASE; PHASE = fopen("Phase.00000","wb");