From d92a6c9dd9aa4d1094f1cc50b65b7d71228d54d7 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 9 Nov 2018 18:04:54 -0500 Subject: [PATCH 1/6] fixe dtolerance --- models/ColorModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 715cd8f2..4c98a98b 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -573,7 +573,7 @@ void ScaLBL_ColorModel::Run(){ if (fabs((Ca - Ca_previous)/Ca) < tolerance ){ if (rank==0) printf("** WRITE STEADY POINT *** "); - tolerance = 1.f; + printf("Ca = %f, (previous = %f), tolerance = %f \n",Ca,Ca_previous); MORPH_ADAPT = true; FILE * kr_log_file = fopen("relperm.csv","a"); From 73c9f5fa3760ada80bd95465022f243dc677d65f Mon Sep 17 00:00:00 2001 From: James E McClure Date: Fri, 9 Nov 2018 22:53:17 -0500 Subject: [PATCH 2/6] fix morph_interval --- models/ColorModel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 4c98a98b..d3c6f2e0 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -573,7 +573,7 @@ void ScaLBL_ColorModel::Run(){ if (fabs((Ca - Ca_previous)/Ca) < tolerance ){ if (rank==0) printf("** WRITE STEADY POINT *** "); - printf("Ca = %f, (previous = %f), tolerance = %f \n",Ca,Ca_previous); + printf("Ca = %f, (previous = %f) \n",Ca,Ca_previous); MORPH_ADAPT = true; FILE * kr_log_file = fopen("relperm.csv","a"); @@ -621,6 +621,7 @@ void ScaLBL_ColorModel::Run(){ printf("** Continue to simulate steady *** \n "); printf("Ca = %f, (previous = %f) \n",Ca,Ca_previous); } + morph_timesteps=0; } Ca_previous = Ca; } From ba7213080c57a65b1a917a42b0cd0d17ae0c4cc8 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Sat, 10 Nov 2018 07:05:13 -0500 Subject: [PATCH 3/6] fixed parlalel print --- models/ColorModel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index d3c6f2e0..465e69fc 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -572,8 +572,10 @@ void ScaLBL_ColorModel::Run(){ //double krB = muB*volB*flow_rate_B/force_magnitude/double(Nx*Ny*Nz*nprocs); if (fabs((Ca - Ca_previous)/Ca) < tolerance ){ - if (rank==0) printf("** WRITE STEADY POINT *** "); - printf("Ca = %f, (previous = %f) \n",Ca,Ca_previous); + if (rank==0){ + printf("** WRITE STEADY POINT *** "); + printf("Ca = %f, (previous = %f) \n",Ca,Ca_previous); + } MORPH_ADAPT = true; FILE * kr_log_file = fopen("relperm.csv","a"); From a390bda2f88404ef115f9a2e44cbdf6c895e9a19 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Sat, 10 Nov 2018 13:21:26 -0500 Subject: [PATCH 4/6] fixed tolerance in color model --- models/ColorModel.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 465e69fc..b43b44d7 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -598,9 +598,7 @@ void ScaLBL_ColorModel::Run(){ Fy *= 1e-6/force_magnitude; Fz *= 1e-6/force_magnitude; } - tolerance = fabs(Ca-capillary_number)/ Ca ; - if (rank == 0) printf(" -- adjust force by %f \n ",tolerance); - + if (rank == 0) printf(" -- adjust force by factor %f \n ",capillary_number / Ca); Averages->SetParams(rhoA,rhoB,tauA,tauB,Fx,Fy,Fz,alpha); } @@ -641,7 +639,6 @@ void ScaLBL_ColorModel::Run(){ } MPI_Barrier(comm); morph_timesteps = 0; - tolerance = 1.f; } morph_timesteps += analysis_interval; } From 24dc725d041ead86ac4cc18b247833dda24b63c3 Mon Sep 17 00:00:00 2001 From: James E McClure Date: Sat, 10 Nov 2018 15:18:09 -0500 Subject: [PATCH 5/6] fixed tolerance in color model --- models/ColorModel.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index b43b44d7..cfa16bb0 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -572,17 +572,18 @@ void ScaLBL_ColorModel::Run(){ //double krB = muB*volB*flow_rate_B/force_magnitude/double(Nx*Ny*Nz*nprocs); if (fabs((Ca - Ca_previous)/Ca) < tolerance ){ + MORPH_ADAPT = true; if (rank==0){ printf("** WRITE STEADY POINT *** "); printf("Ca = %f, (previous = %f) \n",Ca,Ca_previous); + + FILE * kr_log_file = fopen("relperm.csv","a"); + fprintf(kr_log_file,"%i %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g .5g %.5g %.5g\n",timestep,muA,muB,5.796*alpha,Fx,Fy,Fz,volA,volB,vA_x,vA_y,vA_z,vB_x,vB_y,vB_z); + fclose(kr_log_file); + + printf(" Measured capillary number %f \n ",Ca); } - MORPH_ADAPT = true; - FILE * kr_log_file = fopen("relperm.csv","a"); - fprintf(kr_log_file,"%i %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g .5g %.5g %.5g\n",timestep,muA,muB,5.796*alpha,Fx,Fy,Fz,volA,volB,vA_x,vA_y,vA_z,vB_x,vB_y,vB_z); - fclose(kr_log_file); - - if (rank == 0) printf(" Measured capillary number %f \n ",Ca); if (SET_CAPILLARY_NUMBER ){ Fx *= capillary_number / Ca; Fy *= capillary_number / Ca; From 67ca2d51610e8039a9504bf535083d95e495c73f Mon Sep 17 00:00:00 2001 From: James E McClure Date: Sun, 11 Nov 2018 08:51:01 -0500 Subject: [PATCH 6/6] fixed write out (steady) --- models/ColorModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index cfa16bb0..3f94f098 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -578,7 +578,7 @@ void ScaLBL_ColorModel::Run(){ printf("Ca = %f, (previous = %f) \n",Ca,Ca_previous); FILE * kr_log_file = fopen("relperm.csv","a"); - fprintf(kr_log_file,"%i %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g .5g %.5g %.5g\n",timestep,muA,muB,5.796*alpha,Fx,Fy,Fz,volA,volB,vA_x,vA_y,vA_z,vB_x,vB_y,vB_z); + fprintf(kr_log_file,"%i %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g %.5g\n",timestep-analysis_interval+20,muA,muB,5.796*alpha,Fx,Fy,Fz,volA,volB,vA_x,vA_y,vA_z,vB_x,vB_y,vB_z); fclose(kr_log_file); printf(" Measured capillary number %f \n ",Ca);