From 6739893762d2cd95dde8ae575446927a4943aae7 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 5 Jun 2015 12:15:28 -0400 Subject: [PATCH] Fixing TestBlobAnalyze --- tests/TestBlobAnalyze.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/TestBlobAnalyze.cpp b/tests/TestBlobAnalyze.cpp index 6aac4a66..6b884e1e 100644 --- a/tests/TestBlobAnalyze.cpp +++ b/tests/TestBlobAnalyze.cpp @@ -187,12 +187,9 @@ int main(int argc, char **argv) MPI_Barrier(MPI_COMM_WORLD); if (rank == 0) cout << "Domain set." << endl; //....................................................................... - char *id; - id = new char[Nx*Ny*Nz]; - DoubleArray Phase(Nx,Ny,Nz); - DoubleArray SignDist(Nx,Ny,Nz); + //....................................................................... - SignedDistance(Phase.get(),nspheres,cx,cy,cz,rad,Lx,Ly,Lz,Nx,Ny,Nz, + SignedDistance(Averages.Phase.get(),nspheres,cx,cy,cz,rad,Lx,Ly,Lz,Nx,Ny,Nz, Dm.iproc,Dm.jproc,Dm.kproc,Dm.nprocx,Dm.nprocy,Dm.nprocz); //....................................................................... // Assign the phase ID field based on the signed distance @@ -202,13 +199,13 @@ int main(int argc, char **argv) for ( i=1;i 0.0){ - id[n] = 2; + Dm.id[n] = 2; } else{ - id[n] = 1; + Dm.id[n] = 1; } } }