Revert "Changing my mind again -- removed distance from NWP analysis"

This reverts commit 599c7b55f9.
This commit is contained in:
James E McClure
2015-11-14 21:43:18 -05:00
parent 599c7b55f9
commit f2902021ec
2 changed files with 6 additions and 6 deletions

View File

@@ -179,7 +179,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
{
double factor,temp,value;
factor=0.5/Beta;
/* // Initialize to -1,1 (segmentation)
// Initialize to -1,1 (segmentation)
for (int k=0; k<Nz; k++){
for (int j=0; j<Ny; j++){
for (int i=0; i<Nx; i++){
@@ -205,7 +205,7 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
}
}
SSO(DistData,TempID,Dm,160);
SSO(DistData,TempID,Dm,200);
for (int k=0; k<Nz; k++){
for (int j=0; j<Ny; j++){
@@ -214,15 +214,15 @@ void TwoPhase::ColorToSignedDistance(double Beta, DoubleArray &ColorData, Double
}
}
}
*/
for (int k=0; k<Nz; k++){
/* for (int k=0; k<Nz; k++){
for (int j=0; j<Ny; j++){
for (int i=0; i<Nx; i++){
DistData(i,j,k) = ColorData(i,j,k);
}
}
}
*/
}

View File

@@ -572,7 +572,7 @@ int main(int argc, char **argv)
MPI_Barrier(comm);
//.......................................................................
// Once phase has been initialized, map solid to account for 'smeared' interface
for (i=0; i<N; i++) Averages->SDs(i) -= (1.0); //
//for (i=0; i<N; i++) Averages->SDs(i) -= (1.0); //
//.......................................................................
// Finalize setup for averaging domain
//Averages->SetupCubes(Mask);