From 842d9a01d6879f87c1eba8add81f1fd538472281 Mon Sep 17 00:00:00 2001
From: James E McClure <jemcclur@gmail.com>
Date: Mon, 17 Dec 2018 18:47:44 -0500
Subject: [PATCH] estimate growth better

---
 analysis/morphology.cpp |  5 ++---
 models/ColorModel.cpp   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/analysis/morphology.cpp b/analysis/morphology.cpp
index 3e17de19..9c96279f 100644
--- a/analysis/morphology.cpp
+++ b/analysis/morphology.cpp
@@ -345,7 +345,7 @@ double MorphGrow(DoubleArray &BoundaryDist, DoubleArray &Dist, Array<char> &id,
 				for (int i=1; i<Nx-1; i++){
 					double walldist=BoundaryDist(i,j,k);
 					double wallweight = 1.0 / (1+exp(-5.f*(walldist-1.f))); 
-					wallweight = 1.0;
+					//wallweight = 1.0;
 					if (fabs(wallweight*morph_delta) > MAX_DISPLACEMENT) MAX_DISPLACEMENT= fabs(wallweight*morph_delta);
 					
 					if (Dist(i,j,k) - wallweight*morph_delta < 0.0){
@@ -382,8 +382,7 @@ double MorphGrow(DoubleArray &BoundaryDist, DoubleArray &Dist, Array<char> &id,
 			for (int i=1; i<Nx-1; i++){
 				double walldist=BoundaryDist(i,j,k);
 				double wallweight = 1.0 / (1+exp(-5.f*(walldist-1.f))); 
-				wallweight = 1.0;
-
+				//wallweight = 1.0;
 				Dist(i,j,k) -= wallweight*morph_delta;
 				if (Dist(i,j,k) < 0.0)	count+=1.0;
 			}
diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp
index 17c85563..66c32a16 100644
--- a/models/ColorModel.cpp
+++ b/models/ColorModel.cpp
@@ -589,8 +589,8 @@ void ScaLBL_ColorModel::Run(){
 					if (rank==0){
 						printf("** WRITE STEADY POINT *** ");
 						printf("Ca = %f, (previous = %f) \n",Ca,Ca_previous);
-						volA /= double((Nx-2)*(Ny-2)*(Nz-2)*nprocz);
-						volB /= double((Nx-2)*(Ny-2)*(Nz-2)*nprocz);
+						volA /= double((Nx-2)*(Ny-2)*(Nz-2)*nprocs);
+						volB /= double((Nx-2)*(Ny-2)*(Nz-2)*nprocs);
 						FILE * kr_log_file = fopen("relperm.csv","a");
 						fprintf(kr_log_file,"%i %.5g %.5g %.5g %.5g %.5g %.5g ",timestep-analysis_interval+20,muA,muB,5.796*alpha,Fx,Fy,Fz);
 						fprintf(kr_log_file,"%.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g\n",volA,volB,vA_x,vA_y,vA_z,vB_x,vB_y,vB_z);
@@ -716,9 +716,9 @@ double ScaLBL_ColorModel::MorphInit(const double beta, const double target_delta
 
 	double count,count_global,volume_initial,volume_final;
 	count = 0.f;
-	for (int k=0; k<Nz; k++){
-		for (int j=0; j<Ny; j++){
-			for (int i=0; i<Nx; i++){
+	for (int k=1; k<Nz-1; k++){
+		for (int j=1; j<Ny-1; j++){
+			for (int i=1; i<Nx-1; i++){
 				if (phase(i,j,k) > 0.f && Averages->SDs(i,j,k) > 0.f) count+=1.f;
 			}
 		}
@@ -819,9 +819,9 @@ double ScaLBL_ColorModel::MorphInit(const double beta, const double target_delta
 	}
 
 	count = 0.f;
-	for (int k=0; k<Nz; k++){
-		for (int j=0; j<Ny; j++){
-			for (int i=0; i<Nx; i++){
+	for (int k=1; k<Nz-1; k++){
+		for (int j=1; j<Ny-1; j++){
+			for (int i=1; i<Nx-1; i++){
 				if (phase(i,j,k) > 0.f && Averages->SDs(i,j,k) > 0.f) count+=1.f;
 			}
 		}