From 81c80ff0f41f644a111775755e9e4eda7c83f494 Mon Sep 17 00:00:00 2001
From: James McClure <jemcclur@gmail.com>
Date: Tue, 31 Aug 2021 20:32:02 -0400
Subject: [PATCH] compiler warnings

---
 cpu/GreyscaleColor.cpp    |  4 ++++
 models/GreyscaleModel.cpp | 21 +++++++++++++--------
 models/IonModel.cpp       | 12 ++++++------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/cpu/GreyscaleColor.cpp b/cpu/GreyscaleColor.cpp
index c3e60aac..617cd293 100644
--- a/cpu/GreyscaleColor.cpp
+++ b/cpu/GreyscaleColor.cpp
@@ -1419,6 +1419,8 @@ extern "C" void ScaLBL_D3Q19_AAodd_GreyscaleColor_CP(int *neighborList, int *Map
         mu_eff = (tau_eff-0.5)/3.0;//kinematic viscosity
 		
         mobility_ratio = 1.0;
+        Krn_grey = 0.0;
+        Krw_grey = 0.0;
         if (nA/(nA+nB)<Sn_grey && porosity !=1.0){
         	perm = Kw_grey;
         	Swn = 0.0;
@@ -2253,6 +2255,8 @@ extern "C" void ScaLBL_D3Q19_AAeven_GreyscaleColor_CP(int *Map, double *dist, do
 		rlx_setB = 8.f*(2.f-rlx_setA)/(8.f-rlx_setA);
         mu_eff = (tau_eff-0.5)/3.0;//kinematic viscosity
 	
+        Krn_grey = 0.0;
+        Krw_grey = 0.0;
         if (nA/(nA+nB)<Sn_grey && porosity !=1.0){
         	perm = Kw_grey;
         	Swn = 0.0;
diff --git a/models/GreyscaleModel.cpp b/models/GreyscaleModel.cpp
index 11f8ed63..4b859a1b 100644
--- a/models/GreyscaleModel.cpp
+++ b/models/GreyscaleModel.cpp
@@ -442,16 +442,21 @@ void ScaLBL_GreyscaleModel::Initialize(){
 		if (rank==0){
 			printf("Initializing distributions from Restart! \n");
 		}
-		// Read in the restart file to CPU buffers
-        std::shared_ptr<double> cfq;
-        cfq = std::shared_ptr<double>(new double[19*Np],DeleteArray<double>);
-        FILE *File;
-        File=fopen(LocalRestartFile,"rb");
-        fread(cfq.get(),sizeof(double),19*Np,File);
-        fclose(File);
+		double value;
+        double *cfq;
+        cfq = new double[19*Np];
+		ifstream File(LocalRestartFile,ios::binary);
+		for (int n=0; n<Np; n++){
+			// Read the distributions
+			for (int q=0; q<19; q++){
+				File.read((char*) &value, sizeof(value));
+				cfq[q*Np+n] = value;
+			}
+		}
+		File.close();
 
 		// Copy the restart data to the GPU
-		ScaLBL_CopyToDevice(fq,cfq.get(),19*Np*sizeof(double));
+		ScaLBL_CopyToDevice(fq,cfq,19*Np*sizeof(double));
 		ScaLBL_DeviceBarrier();
 
 		comm.barrier();
diff --git a/models/IonModel.cpp b/models/IonModel.cpp
index 45c6a1ea..7db8745b 100644
--- a/models/IonModel.cpp
+++ b/models/IonModel.cpp
@@ -769,13 +769,13 @@ void ScaLBL_IonModel::Initialize(){
                 if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %zu is concentration = %.5g [mol/m^3] \n",i+1,Cin[i]/(h*h*h*1.0e-18));
                 break;
             case 21:
-                if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive flux only. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
+                if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %zu is (inward) flux = %.5g [mol/m^2/sec]; Diffusive flux only. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
                 break;
             case 22:
-                if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective flux. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
+                if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %zu is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective flux. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
                 break;
             case 23:
-                if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective + electric flux. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
+                if (rank==0) printf("LB Ion Solver: inlet boundary for Ion %zu is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective + electric flux. \n",i+1,Cin[i]/(h*h*1.0e-12)/time_conv[i]);
                 break;
         }
         switch (BoundaryConditionOutlet[i]){
@@ -786,13 +786,13 @@ void ScaLBL_IonModel::Initialize(){
                 if (rank==0) printf("LB Ion Solver: outlet boundary for Ion %zu is concentration = %.5g [mol/m^3] \n",i+1,Cout[i]/(h*h*h*1.0e-18));
                 break;
             case 21:
-                if (rank==0) printf("LB Ion Solver: outlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive flux only. \n",i+1,Cout[i]/(h*h*1.0e-12)/time_conv[i]);
+                if (rank==0) printf("LB Ion Solver: outlet boundary for Ion %zu is (inward) flux = %.5g [mol/m^2/sec]; Diffusive flux only. \n",i+1,Cout[i]/(h*h*1.0e-12)/time_conv[i]);
                 break;
             case 22:
-                if (rank==0) printf("LB Ion Solver: outlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective flux. \n",i+1,Cout[i]/(h*h*1.0e-12)/time_conv[i]);
+                if (rank==0) printf("LB Ion Solver: outlet boundary for Ion %zu is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective flux. \n",i+1,Cout[i]/(h*h*1.0e-12)/time_conv[i]);
                 break;
             case 23:
-                if (rank==0) printf("LB Ion Solver: outlet boundary for Ion %i is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective + electric flux. \n",i+1,Cout[i]/(h*h*1.0e-12)/time_conv[i]);
+                if (rank==0) printf("LB Ion Solver: outlet boundary for Ion %zu is (inward) flux = %.5g [mol/m^2/sec]; Diffusive + advective + electric flux. \n",i+1,Cout[i]/(h*h*1.0e-12)/time_conv[i]);
                 break;
         }
     }