From d53e3bb2649b77a90cc547bc02825fa1da4b5909 Mon Sep 17 00:00:00 2001
From: JamesEMcclure <jemcclur@gmail.com>
Date: Tue, 24 Sep 2019 14:49:28 -0400
Subject: [PATCH 1/2] fix density in relperm

---
 models/ColorModel.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp
index a31586fe..44fa8fee 100644
--- a/models/ColorModel.cpp
+++ b/models/ColorModel.cpp
@@ -812,11 +812,11 @@ void ScaLBL_ColorModel::Run(){
 						double kAeff_connected = h*h*muA*flow_rate_A_connected/(force_mag);
 						double kBeff_connected = h*h*muB*flow_rate_B_connected/(force_mag);
 						
-						double kAeff_disconnected = h*h*muA*flow_rate_A_disconnected/(rhoA*force_mag);
-						double kBeff_disconnected = h*h*muB*flow_rate_B_disconnected/(rhoB*force_mag);
+						double kAeff_disconnected = h*h*muA*flow_rate_A_disconnected/(force_mag);
+						double kBeff_disconnected = h*h*muB*flow_rate_B_disconnected/(force_mag);
 
-						double kAeff = h*h*muA*(flow_rate_A)/(rhoA*force_mag);
-						double kBeff = h*h*muB*(flow_rate_B)/(rhoB*force_mag);
+						double kAeff = h*h*muA*(flow_rate_A)/(force_mag);
+						double kBeff = h*h*muB*(flow_rate_B)/(force_mag);
 
 						double viscous_pressure_drop = (rhoA*volA + rhoB*volB)*force_mag;
 						double Mobility = muA/muB;

From 5ea0b2278c2f749d58f30a8c7ecde8d6c3c469a5 Mon Sep 17 00:00:00 2001
From: JamesEMcclure <jemcclur@gmail.com>
Date: Tue, 24 Sep 2019 14:54:49 -0400
Subject: [PATCH 2/2] fix label / checker bug

---
 common/Domain.cpp            | 53 ++++++++++++++++++---------------
 tests/lbpm_serial_decomp.cpp | 57 ++++++++++++++++++------------------
 2 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/common/Domain.cpp b/common/Domain.cpp
index 4159a0b3..a2be09e5 100644
--- a/common/Domain.cpp
+++ b/common/Domain.cpp
@@ -343,6 +343,34 @@ void Domain::Decomp(std::string Filename)
 			}
 		}
 		printf("Read segmented data from %s \n",Filename.c_str());
+		
+		// relabel the data
+		std::vector<long int> LabelCount(ReadValues.size(),0);
+		for (int k = 0; k<Nz; k++){
+			for (int j = 0; j<Ny; j++){
+				for (int i = 0; i<Nx; i++){
+					n = k*Nx*Ny+j*Nx+i;
+					//char locval = loc_id[n];
+					char locval = SegData[n];
+					for (int idx=0; idx<ReadValues.size(); idx++){
+						signed char oldvalue=ReadValues[idx];
+						signed char newvalue=WriteValues[idx];
+						if (locval == oldvalue){
+							SegData[n] = newvalue;
+							LabelCount[idx]++;
+							idx = ReadValues.size();
+						}
+					}
+				}
+			}
+		}
+		if (RANK==0){
+			for (int idx=0; idx<ReadValues.size(); idx++){
+				long int label=ReadValues[idx];
+				long int count=LabelCount[idx];
+				printf("Label=%d, Count=%d \n",label,count);
+			}
+		}
 
 		if (inlet_layers_x > 0){
 			// use checkerboard pattern
@@ -470,7 +498,6 @@ void Domain::Decomp(std::string Filename)
 	char *loc_id;
 	loc_id = new char [(nx+2)*(ny+2)*(nz+2)];
 
-	std::vector<int> LabelCount(ReadValues.size(),0);
 	// Set up the sub-domains
 	if (RANK==0){
 		printf("Distributing subdomains across %i processors \n",nprocs);
@@ -503,24 +530,6 @@ void Domain::Decomp(std::string Filename)
 							}
 						}
 					}
-					// relabel the data
-					for (k=0;k<nz+2;k++){
-						for (j=0;j<ny+2;j++){
-							for (i=0;i<nx+2;i++){
-								n = k*(nx+2)*(ny+2) + j*(nx+2) + i;;
-								char locval = loc_id[n];
-								for (int idx=0; idx<ReadValues.size(); idx++){
-									signed char oldvalue=ReadValues[idx];
-									signed char newvalue=WriteValues[idx];
-									if (locval == oldvalue){
-										loc_id[n] = newvalue;
-										LabelCount[idx]++;
-										idx = ReadValues.size();
-									}
-								}
-							}
-						}
-					}
 					if (rnk==0){
 						for (k=0;k<nz+2;k++){
 							for (j=0;j<ny+2;j++){
@@ -543,11 +552,7 @@ void Domain::Decomp(std::string Filename)
 				}
 			}
 		}
-		for (int idx=0; idx<ReadValues.size(); idx++){
-			int label=ReadValues[idx];
-			int count=LabelCount[idx];
-			printf("Label=%d, Count=%d \n",label,count);
-		}
+
 	}
 	else{
 		// Recieve the subdomain from rank = 0
diff --git a/tests/lbpm_serial_decomp.cpp b/tests/lbpm_serial_decomp.cpp
index a4b8e385..d08bb21b 100644
--- a/tests/lbpm_serial_decomp.cpp
+++ b/tests/lbpm_serial_decomp.cpp
@@ -164,6 +164,34 @@ int main(int argc, char **argv)
 		printf("Read segmented data from %s \n",Filename.c_str());
 	}
 
+	// relabel the data
+	std::vector<long int> LabelCount(ReadValues.size(),0);
+	for (int k = 0; k<Nz; k++){
+		for (int j = 0; j<Ny; j++){
+			for (int i = 0; i<Nx; i++){
+				n = k*Nx*Ny+j*Nx+i;
+				//char locval = loc_id[n];
+				char locval = SegData[n];
+				for (int idx=0; idx<ReadValues.size(); idx++){
+					signed char oldvalue=ReadValues[idx];
+					signed char newvalue=WriteValues[idx];
+					if (locval == oldvalue){
+						SegData[n] = newvalue;
+						LabelCount[idx]++;
+						idx = ReadValues.size();
+					}
+				}
+			}
+		}
+	}
+	if (rank==0){
+		for (int idx=0; idx<ReadValues.size(); idx++){
+			long int label=ReadValues[idx];
+			long int count=LabelCount[idx];
+			printf("Label=%d, Count=%d \n",label,count);
+		}
+	}
+	
 	if (inlet_count_x > 0){
 		// use checkerboard pattern
 		printf("Checkerboard pattern at x inlet for %i layers \n",inlet_count_x);
@@ -289,7 +317,6 @@ int main(int argc, char **argv)
 	char *loc_id;
 	loc_id = new char [(nx+2)*(ny+2)*(nz+2)];
 
-	std::vector<int> LabelCount(ReadValues.size(),0);
 	// Set up the sub-domains
 	if (rank==0){
 		printf("Distributing subdomains across %i processors \n",nprocs);
@@ -322,28 +349,6 @@ int main(int argc, char **argv)
 							}
 						}
 					}
-					// relabel the data
-					for (k=0;k<nz+2;k++){
-						for (j=0;j<ny+2;j++){
-							for (i=0;i<nx+2;i++){
-								n = k*(nx+2)*(ny+2) + j*(nx+2) + i;;
-								char locval = loc_id[n];
-								for (int idx=0; idx<ReadValues.size(); idx++){
-									signed char oldvalue=ReadValues[idx];
-									signed char newvalue=WriteValues[idx];
-									if (locval == oldvalue){
-										loc_id[n] = newvalue;
-										LabelCount[idx]++;
-										idx = ReadValues.size();
-									}
-								}
-								//if (loc_id[n]==char(SOLID))     loc_id[n] = 0;
-								//else if (loc_id[n]==char(NWP))  loc_id[n] = 1;
-								//else                     loc_id[n] = 2;
-
-							}
-						}
-					}
 
 					// Write the data for this rank data 
 					sprintf(LocalRankFilename,"ID.%05i",rnk+rank_offset);
@@ -354,10 +359,4 @@ int main(int argc, char **argv)
 			}
 		}
 	}
-	for (int idx=0; idx<ReadValues.size(); idx++){
-		int label=ReadValues[idx];
-		int count=LabelCount[idx];
-		printf("Label=%d, Count=%d \n",label,count);
-	}
-
 }