Fixing TestBlobAnalyze

This commit is contained in:
James E McClure 2015-06-05 12:15:28 -04:00
parent 66dfaf5f1b
commit 6739893762

View File

@ -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<Nx-1;i++){
n = k*Nx*Ny+j*Nx+i;
// Shrink the sphere sizes by two voxels to make sure they don't touch
SignDist(i,j,k) = 100.0;
Phase(i,j,k) += 2.0;
Averages.SDs(i,j,k) = 100.0;
Averages.Phase(i,j,k) += 2.0;
if (Phase(i,j,k) > 0.0){
id[n] = 2;
Dm.id[n] = 2;
}
else{
id[n] = 1;
Dm.id[n] = 1;
}
}
}