assume uniform density in phase regions

This commit is contained in:
JamesEMcclure 2019-09-04 12:28:04 -04:00
parent 371540ecca
commit ef697861a8

View File

@ -203,6 +203,7 @@ void SubPhase::Basic(){
double nB = Rho_w(n);
double phi = (nA-nB)/(nA+nB);
if ( phi > 0.0 ){
nA = 1.0;
nb.V += 1.0;
nb.M += nA*rho_n;
// velocity
@ -211,6 +212,7 @@ void SubPhase::Basic(){
nb.Pz += rho_n*nA*Vel_z(n);
}
else{
nB = 1.0;
wb.M += nB*rho_w;
wb.V += 1.0;
@ -568,7 +570,7 @@ void SubPhase::Full(){
}
if ( phi > 0.0){
if (morph_n->label(i,j,k) > 0 ){
//nA = 1.0;
nA = 1.0;
nd.M += nA*rho_n;
nd.Px += nA*rho_n*ux;
nd.Py += nA*rho_n*uy;
@ -576,7 +578,7 @@ void SubPhase::Full(){
nd.K += nA*rho_n*(ux*ux + uy*uy + uz*uz);
}
else{
//nA = 1.0;
nA = 1.0;
nc.M += nA*rho_n;
nc.Px += nA*rho_n*ux;
nc.Py += nA*rho_n*uy;
@ -587,7 +589,7 @@ void SubPhase::Full(){
else{
// water region
if (morph_w->label(i,j,k) > 0 ){
//nB = 1.0;
nB = 1.0;
wd.M += nB*rho_w;
wd.Px += nB*rho_w*ux;
wd.Py += nB*rho_w*uy;
@ -595,7 +597,7 @@ void SubPhase::Full(){
wd.K += nB*rho_w*(ux*ux + uy*uy + uz*uz);
}
else{
//nB = 1.0;
nB = 1.0;
wc.M += nB*rho_w;
wc.Px += nB*rho_w*ux;
wc.Py += nB*rho_w*uy;