From 1a96411aa9e0e0de7f8c0811d35a3130fd6496a7 Mon Sep 17 00:00:00 2001
From: James E McClure <jemcclur@gmail.com>
Date: Thu, 17 Aug 2017 09:31:11 -0400
Subject: [PATCH] Juanes benchmark looks to be working now

---
 tests/lbpm_juanes_bench_disc_pp.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/lbpm_juanes_bench_disc_pp.cpp b/tests/lbpm_juanes_bench_disc_pp.cpp
index e9fadf98..3f91b821 100644
--- a/tests/lbpm_juanes_bench_disc_pp.cpp
+++ b/tests/lbpm_juanes_bench_disc_pp.cpp
@@ -287,7 +287,7 @@ int main(int argc, char **argv)
 	MPI_Bcast(rad,ndiscs,MPI_DOUBLE,0,comm);
 	//...........................................................................
 	MPI_Barrier(comm);
-	if (rank == 0){
+	/*	if (rank == 0){
 		cout << "Domain set." << endl;
 		printf("************ \n");
 		printf("Discs are: \n");
@@ -296,11 +296,14 @@ int main(int argc, char **argv)
 		}
 		printf("************ \n");
 	}
-
+	*/
+	MPI_Barrier(comm);
 	if (nprocz > 1 && rank==0) printf("Disc packs are 2D -- are you sure you want nprocz > 1? \n");
+	if (rank ==0) printf("Compute the signed distance part I \n");
 	//.......................................................................
-	SignedDistanceDiscPack(SignDist.data(),ndiscs,cx,cy,rad,Lx,Ly,Lz,Nx,Ny,Nz,
+		SignedDistanceDiscPack(SignDist.data(),ndiscs,cx,cy,rad,Lx,Ly,Lz,Nx,Ny,Nz,
 					   iproc,jproc,kproc,nprocx,nprocy,nprocz);
+	
 	//.......................................................................
 	// Assign walls in the signed distance functions (x,y boundaries)
 	double dst;
@@ -308,6 +311,8 @@ int main(int argc, char **argv)
 	int center_x=nprocx*Nx/2;
 	int center_y=nprocy*Ny/2;
 
+	if (rank ==0) printf("Compute the signed distance part II \n");
+
 	for (k=0;k<Nz;k++){
 		for (j=0;j<Ny;j++){
 			for (i=0;i<Nx;i++){
@@ -324,15 +329,19 @@ int main(int argc, char **argv)
 
 				if (k<Nz/2){
 					// distance map for the solid boundary at the inlet layer
-					dst = min(dist_to_bottom,dist_to_inlet);
+					if (dist_to_inlet > 0.f) 		dst = dist_to_inlet;
+					else if (dist_to_bottom > 0.f) 	dst = dist_to_bottom;
+					else 							dst = dist_to_inlet;
+				    
 				}
 				else{
 					// distance map for the solid boundary at the outlet layer
-					dst = min(dist_to_top,dist_to_outlet);
+					if (dist_to_outlet > 0.f)		dst = sqrt(dist_to_top*dist_to_top + dist_to_outlet*dist_to_outlet);
+					else 							dst = dist_to_outlet;
 				}
 
-				if (k<5) 						SignDist(i,j,k) = dst;
-				else if (Nz-k<5) 				SignDist(i,j,k) = dst;
+				if (k<4) 						SignDist(i,j,k) = dist_to_bottom;
+				else if (Nz-k<4) 				SignDist(i,j,k) = dist_to_top;
 				else if (dst < SignDist(i,j,k)) SignDist(i,j,k) = dst;
 			}
 		}