From ebca0af48b3be337ae531a1a0fdec203b495f8d7 Mon Sep 17 00:00:00 2001
From: James E McClure <mcclurej@vt.edu>
Date: Sun, 15 Nov 2015 08:47:19 -0500
Subject: [PATCH] Revert "Revert "Changing my mind again -- removed distance
 from NWP analysis""

This reverts commit f2902021ec2dfe22f2bff0e0d75d472e595cf694.
---
 common/TwoPhase.cpp            | 10 +++++-----
 tests/lbpm_color_simulator.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/TwoPhase.cpp b/common/TwoPhase.cpp
index 345923cb..5b22ab62 100644
--- a/common/TwoPhase.cpp
+++ b/common/TwoPhase.cpp
@@ -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,200);
+	SSO(DistData,TempID,Dm,160);
 
     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);
 			}
 		}
 	}
-*/
+
 }
 
 
diff --git a/tests/lbpm_color_simulator.cpp b/tests/lbpm_color_simulator.cpp
index 17ab0e98..d9901800 100644
--- a/tests/lbpm_color_simulator.cpp
+++ b/tests/lbpm_color_simulator.cpp
@@ -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);