diff --git a/analysis/SubPhase.cpp b/analysis/SubPhase.cpp index 9c2f4529..3047bd0a 100644 --- a/analysis/SubPhase.cpp +++ b/analysis/SubPhase.cpp @@ -245,8 +245,8 @@ void SubPhase::Basic(){ force_mag = 1.0; } double saturation=gwb.V/(gwb.V + gnb.V); - double water_flow_rate=gwb.V*(gwb.Px*dir_x + gwb.Py*dir_y + gwb.Pz*dir_z)/gwb.M / Dm->Volume; - double not_water_flow_rate=gnb.V*(gnb.Px*dir_x + gnb.Py*dir_y + gnb.Pz*dir_z)/gnb.M/ Dm->Volume; + double water_flow_rate=gwb.V*sqrt(gwb.Px*gwb.Px + gwb.Py*gwb.Py + gwb.Pz*gwb.Pz)/gwb.M / Dm->Volume; + double not_water_flow_rate=gnb.V*sqrt(gnb.Px*gnb.Px + gnb.Py*gnb.Py + gnb.Pz*gnb.Pz)/gnb.M/ Dm->Volume; double total_flow_rate = water_flow_rate + not_water_flow_rate; double fractional_flow= water_flow_rate / total_flow_rate; diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 1afeb161..0e39ee73 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -641,8 +641,8 @@ void ScaLBL_ColorModel::Run(){ force_mag = 1.0; } double current_saturation = volB/(volA+volB); - double flow_rate_A = volA*(vA_x*dir_x + vA_y*dir_y + vA_z*dir_z); - double flow_rate_B = volB*(vB_x*dir_x + vB_y*dir_y + vB_z*dir_z); + double flow_rate_A = volA*sqrt(vA_x*vA_x + vA_y*vA_y + vA_z*vA_z); + double flow_rate_B = volB*sqrt(vB_x*vB_x + vB_y*vB_y + vB_z*vB_z); double Ca = fabs(muA*flow_rate_A + muB*flow_rate_B)/(5.796*alpha); if ( morph_timesteps > morph_interval ){