diff --git a/models/ColorModel.cpp b/models/ColorModel.cpp index 7c597935..acda1874 100644 --- a/models/ColorModel.cpp +++ b/models/ColorModel.cpp @@ -749,31 +749,32 @@ void ScaLBL_ColorModel::Run(){ if (rank==0){ printf("** WRITE STEADY POINT *** "); printf("Ca = %f, (previous = %f) \n",Ca,Ca_previous); + double h = Dm->voxel_length; + double pA = Averages->gnb.p; double pB = Averages->gwb.p; + double pAc = Averages->gnc.p; + double pBc = Averages->gwc.p; + double pAB = (pA-pB)/(h*5.796*alpha); + double pAB_connected = (pAc-pBc)/(h*5.796*alpha); - double h = Dm->voxel_length; double kAeff = h*h*muA*flow_rate_A/(rhoA*force_mag); double kBeff = h*h*muB*flow_rate_B/(rhoB*force_mag); - double pAB = (pA-pB)/(h*5.796*alpha); double viscous_pressure_drop = (rhoA*volA + rhoB*volB)*force_mag; double Mobility = muA/muB; double Vol_nc = Averages->gnc.V/Dm->Volume; double Vol_wc = Averages->gwc.V/Dm->Volume; - double vAc_x = Averages->gnc.Px/Averages->gnb.M; - double vAc_y = Averages->gnc.Py/Averages->gnb.M; - double vAc_z = Averages->gnc.Pz/Averages->gnb.M; - double vBc_x = Averages->gwc.Px/Averages->gwb.M; - double vBc_y = Averages->gwc.Py/Averages->gwb.M; - double vBc_z = Averages->gwc.Pz/Averages->gwb.M; + double vAc_x = Averages->gnc.Px/Averages->gnc.M; + double vAc_y = Averages->gnc.Py/Averages->gnc.M; + double vAc_z = Averages->gnc.Pz/Averages->gnc.M; + double vBc_x = Averages->gwc.Px/Averages->gwc.M; + double vBc_y = Averages->gwc.Py/Averages->gwc.M; + double vBc_z = Averages->gwc.Pz/Averages->gwc.M; 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 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 pAc = Averages->gnc.p; - double pBc = Averages->gwc.p; - double pAB_connected = (pAc-pBc)/(h*5.796*alpha); bool WriteHeader=false; FILE * kr_log_file = fopen("relperm.csv","r");