From 957ba24c14c09ade313c0578f1cf336fcd6771e9 Mon Sep 17 00:00:00 2001
From: James E McClure <jemcclur@gmail.com>
Date: Wed, 28 Jan 2015 19:27:24 -0500
Subject: [PATCH] Realized I made a dumb mistake (forgot to compute DelPhi)

---
 common/TwoPhase.h              | 6 +++---
 tests/lb2_Color_wia_mpi.cpp    | 1 +
 tests/lbpm_color_simulator.cpp | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/TwoPhase.h b/common/TwoPhase.h
index 1e3a49d9..eea77d67 100644
--- a/common/TwoPhase.h
+++ b/common/TwoPhase.h
@@ -306,12 +306,12 @@ public:
 void TwoPhase::ColorToSignedDistance(double Beta, double *ColorData, double *DistData){
 
 	double temp=0.5/Beta;
-/*	for (int n=0; n<Nx*Ny*Nz; n++){
+	for (int n=0; n<Nx*Ny*Nz; n++){
 		double value = ColorData[n];
 		DistData[n] = temp*log((1.0+value)/(1.0-value));
 	}
-*/
-	for (int n=0; n<Nx*Ny*Nz; n++)	DistData[n] = ColorData[n];
+
+//	for (int n=0; n<Nx*Ny*Nz; n++)	DistData[n] = ColorData[n];
 }
 
 void TwoPhase::ComputeDelPhi(){
diff --git a/tests/lb2_Color_wia_mpi.cpp b/tests/lb2_Color_wia_mpi.cpp
index 0fc1296c..afb0eb06 100644
--- a/tests/lb2_Color_wia_mpi.cpp
+++ b/tests/lb2_Color_wia_mpi.cpp
@@ -1684,6 +1684,7 @@ int main(int argc, char **argv)
 			//....................................................................
 			// The following need to be called each time new averages are computed
 			Averages.Initialize();
+			Averages.ComputeDelPhi();
 			Averages.ColorToSignedDistance(beta,Averages.Phase.data,Averages.SDn.data);
 			Averages.UpdateMeshValues();
 			Averages.ComputeLocal();
diff --git a/tests/lbpm_color_simulator.cpp b/tests/lbpm_color_simulator.cpp
index c3b203a7..cffc4adf 100644
--- a/tests/lbpm_color_simulator.cpp
+++ b/tests/lbpm_color_simulator.cpp
@@ -1574,8 +1574,8 @@ int main(int argc, char **argv)
 			CopyToHost(Averages.Phase_tminus.data,Phi,N*sizeof(double));
 			Averages.ColorToSignedDistance(beta,Averages.Phase_tminus.data,Averages.Phase_tminus.data);
 			//....................................................................
-			// The following need to be called each time new averages are computed
 			Averages.Initialize();
+			Averages.ComputeDelPhi();
 			Averages.ColorToSignedDistance(beta,Averages.Phase.data,Averages.SDn.data);
 			Averages.UpdateMeshValues();
 			Averages.ComputeLocal();