From 68a59e8ea35d510068c870160a44a917253588c1 Mon Sep 17 00:00:00 2001
From: James McClure <mcclurej@vt.edu>
Date: Fri, 26 Jun 2015 19:44:45 -0400
Subject: [PATCH] nearly workinh version on hokiespeed (wp avg is nan)

---
 gpu/Color.cu                   | 7 +++----
 tests/lbpm_color_simulator.cpp | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gpu/Color.cu b/gpu/Color.cu
index 5595d0cc..40f4e058 100644
--- a/gpu/Color.cu
+++ b/gpu/Color.cu
@@ -1084,7 +1084,6 @@ __global__  void dvc_ColorCollideOpt( char *ID, double *disteven, double *distod
 
 			}// check if n is in the solid
 			}
-
 	} // loop over n
 }
 
@@ -1384,13 +1383,13 @@ __global__  void dvc_ComputePhi(char *ID, double *Phi, double *Den, int N)
 		//........Get 1-D index for this thread....................
 		n = S*blockIdx.x*blockDim.x + s*blockDim.x + threadIdx.x;
 		if (n<N){
-//		   id=ID[n];
-//		   if (id != 0){
+		   id=ID[n];
+		   if (id != 0){
 			// Get the density value (Streaming already performed)
 			Na = Den[n];
 			Nb = Den[N+n];
 			Phi[n] = (Na-Nb)/(Na+Nb);
-//			}
+			}
 		}
 	}
 	//...................................................................
diff --git a/tests/lbpm_color_simulator.cpp b/tests/lbpm_color_simulator.cpp
index 042d7cbb..34f0d721 100644
--- a/tests/lbpm_color_simulator.cpp
+++ b/tests/lbpm_color_simulator.cpp
@@ -1558,7 +1558,6 @@ int main(int argc, char **argv)
 
 		MPI_Barrier(MPI_COMM_WORLD);
 
-		//
 		// Timestep completed!
 		timestep++;
 		//...................................................................