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

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James McClure
2021-11-07 07:56:31 -05:00
parent 19df16da96 1fe39b8223
commit ccd05a6117
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
models/ColorModel.cpp
View File

@@ -723,7 +723,7 @@ double ScaLBL_ColorModel::Run(int returntime){
analysis.basic(timestep, current_db, *Averages, Phi, Pressure, Velocity, fq, Den ); // allow initial ramp-up to get closer to steady state
CURRENT_TIMESTEP += 2;
if (CURRENT_TIMESTEP > MIN_STEADY_TIMESTEPS){
if (CURRENT_TIMESTEP > MIN_STEADY_TIMESTEPS && BC == 0){
analysis.finish();
double volB = Averages->gwb.V;
@@ -760,7 +760,7 @@ double ScaLBL_ColorModel::Run(int returntime){
isSteady = true;
if (CURRENT_TIMESTEP >= MAX_STEADY_TIMESTEPS)
isSteady = true;
if (isSteady && (Ca > maxCa || Ca < minCa) && SET_CAPILLARY_NUMBER ){
/* re-run the point if the actual Ca is too far from the target Ca */
isSteady = false;