OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout right color model

Browse Source
This commit is contained in:
James McClure 2021-12-10 12:19:08 -05:00
parent 90c3513e09
commit 44a7653c60
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
models/ColorModel.cpp
View File

@ -618,6 +618,7 @@ double ScaLBL_ColorModel::Run(int returntime) {
bool SET_CAPILLARY_NUMBER = false;
bool TRIGGER_FORCE_RESCALE = false;
double tolerance = 0.01;
auto WettingConvention = color_db->getWithDefault<std::string>( "WettingConvention", "none" );
auto current_db = db->cloneDatabase();
auto flow_db = db->getDatabase("FlowAdaptor");
int MIN_STEADY_TIMESTEPS =
@ -645,7 +646,7 @@ double ScaLBL_ColorModel::Run(int returntime) {
if (analysis_db->keyExists("tolerance")) {
tolerance = analysis_db->getScalar<double>("tolerance");
}
runAnalysis analysis(current_db, rank_info, ScaLBL_Comm, Dm, Np, Regular,
Map);
auto t1 = std::chrono::system_clock::now();
@ -964,6 +965,41 @@ double ScaLBL_ColorModel::Run(int returntime) {
fprintf(kr_log_file, "%.5g\n", eff_pres);
fclose(kr_log_file);
if (WettingConvention == "SCAL"){
WriteHeader = false;
FILE *scal_log_file = fopen("SCAL.csv", "r");
if (scal_log_file != NULL)
fclose(scal_log_file);
else
WriteHeader = true;
scal_log_file = fopen("SCAL.csv", "a");
if (WriteHeader) {
fprintf(scal_log_file, "timesteps sat.water ");
fprintf(scal_log_file, "eff.perm.oil.upper.bound "
"eff.perm.water.upper.bound ");
fprintf(scal_log_file,
"eff.perm.oil.lower.bound "
"eff.perm.water.lower.bound ");
fprintf(scal_log_file, "eff.perm.oil.disconnected "
"eff.perm.water.disconnected ");
fprintf(scal_log_file,
"cap.pressure cap.pressure.connected "
"Ca eff.pressure\n");
}
fprintf(scal_log_file, "%i %.5g ", CURRENT_TIMESTEP,
current_saturation);
fprintf(scal_log_file, "%.5g %.5g ", kAeff_low, kBeff_low);
fprintf(scal_log_file, "%.5g %.5g ", kAeff_connected_low,
kBeff_connected_low);
fprintf(scal_log_file, "%.5g %.5g ", kAeff_disconnected,
kBeff_disconnected);
fprintf(scal_log_file, "%.5g %.5g %.5g ", pAB,
pAB_connected, Ca);
fprintf(scal_log_file, "%.5g\n", eff_pres);
fclose(scal_log_file);
}
printf(" Measured capillary number %f \n ", Ca);
}
if (SET_CAPILLARY_NUMBER) {