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

fix merge

Browse Source
This commit is contained in:
James McClure
2019-08-31 12:30:33 -04:00
parent 00f2a74b3c 540eca6955
commit 4ca8695b47
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
analysis/SubPhase.cpp
View File

@@ -630,6 +630,11 @@ void SubPhase::Full(){
giwn.Kw=sumReduce( Dm->Comm, iwn.Kw);
// pressure averaging
gnc.p=sumReduce( Dm->Comm, nc.p);
gnd.p=sumReduce( Dm->Comm, nd.p);
gwc.p=sumReduce( Dm->Comm, wc.p);
gwd.p=sumReduce( Dm->Comm, wd.p);
if (vol_wc_bulk > 0.0)
wc.p = wc.p /vol_wc_bulk;
if (vol_nc_bulk > 0.0)

13
models/ColorModel.cpp
View File

@@ -804,17 +804,18 @@ void ScaLBL_ColorModel::Run(){
double flow_rate_A_connected = Vol_nc*(vAc_x*dir_x + vAc_y*dir_y + vAc_z*dir_z);
double flow_rate_B_connected = Vol_wc*(vBc_x*dir_x + vBc_y*dir_y + vBc_z*dir_z);
double flow_rate_A_disconnected = Vol_nd*(vAd_x*dir_x + vAd_y*dir_y + vAd_z*dir_z);
double flow_rate_B_disconnected = Vol_wd*(vBd_x*dir_x + vBd_y*dir_y + vBd_z*dir_z);
double flow_rate_A_total = (Vol_nd+Vol_nc)*(vAd_x*dir_x + vAd_y*dir_y + vAd_z*dir_z + vAc_x*dir_x + vAc_y*dir_y + vAc_z*dir_z);
double flow_rate_B_total = (Vol_wd+Vol_wc)*(vBd_x*dir_x + vBd_y*dir_y + vBd_z*dir_z + vBc_x*dir_x + vBc_y*dir_y + vBc_z*dir_z);
double kAeff_connected = h*h*muA*flow_rate_A_connected/(rhoA*force_mag);
double kBeff_connected = h*h*muB*flow_rate_B_connected/(rhoB*force_mag);
double kAeff_connected = h*h*muA*flow_rate_A_connected/(force_mag);
double kBeff_connected = h*h*muB*flow_rate_B_connected/(force_mag);
double kAeff_disconnected = h*h*muA*flow_rate_A_disconnected/(rhoA*force_mag);
double kBeff_disconnected = h*h*muB*flow_rate_B_disconnected/(rhoB*force_mag);
double kAeff = h*h*muA*(flow_rate_A_connected+flow_rate_A_disconnected)/(rhoA*force_mag);
double kBeff = h*h*muB*(flow_rate_B_connected+flow_rate_B_disconnected)/(rhoB*force_mag);
double kAeff = h*h*muA*(flow_rate_A)/(rhoA*force_mag);
double kBeff = h*h*muB*(flow_rate_B)/(rhoB*force_mag);
double viscous_pressure_drop = (rhoA*volA + rhoB*volB)*force_mag;
double Mobility = muA/muB;