refactor minkowski scalar tool

This commit is contained in:
James E McClure 2018-09-15 13:49:28 -04:00
parent 8c7b7500d2
commit 12adc3b185

View File

@ -173,6 +173,7 @@ int main(int argc, char **argv)
// Initialize the domain and communication // Initialize the domain and communication
nx+=2; ny+=2; nz+=2; nx+=2; ny+=2; nz+=2;
Array<char> id(nx,ny,nz); Array<char> id(nx,ny,nz);
DoubleArray Distance(nx,ny,nz);
//if (rank==0){ //if (rank==0){
//printf("ID: %i, %i, %i \n",Dm->Nx, Dm->Ny, Dm->Nz); //printf("ID: %i, %i, %i \n",Dm->Nx, Dm->Ny, Dm->Nz);
@ -196,21 +197,17 @@ int main(int argc, char **argv)
for (i=0;i<nx;i++){ for (i=0;i<nx;i++){
n=k*nx*ny+j*nx+i; n=k*nx*ny+j*nx+i;
// Initialize distance to +/- 1 // Initialize distance to +/- 1
Averages->SDn(i,j,k) = 2.0*double(id(i,j,k))-1.0; Distance(i,j,k) = 2.0*double(id(i,j,k))-1.0;
} }
} }
} }
//MeanFilter(Averages->SDn);
//std::array<bool> bc(3)={1,1,1}; //std::array<bool> bc(3)={1,1,1};
if (rank==0) printf("Initialized solid phase -- Converting to Signed Distance function \n"); if (rank==0) printf("Initialized solid phase -- Converting to Signed Distance function \n");
CalcDist(Averages->SDn,id,*Dm); CalcDist(Distance,id,*Dm);
if (rank==0) printf("Computing Minkowski functionals \n"); if (rank==0) printf("Computing Minkowski functionals \n");
Averages->Initialize(); Averages->ComputeScalar(Dist[0],0.f);
Averages->UpdateMeshValues();
Averages->ComputeLocal();
Averages->Reduce();
Averages->PrintAll(); Averages->PrintAll();
} }
PROFILE_STOP("Main"); PROFILE_STOP("Main");