Corrected a bug in computation of effective mobilities.

This commit is contained in:
Xavier Raynaud 2012-04-23 10:07:51 +02:00
parent a0794117c9
commit 88941610ed
2 changed files with 30 additions and 32 deletions

View File

@ -147,10 +147,10 @@ namespace Opm
double mu_w = visc[0];
double mu_m;
double omega = mix_param_;
double mu_m_dc;
double dmu_m_dc;
if (if_with_der) {
mu_m = viscMultWithDer(c, &mu_m_dc)*mu_w;
mu_m_dc *= mu_w;
mu_m = viscMultWithDer(c, &dmu_m_dc)*mu_w;
dmu_m_dc *= mu_w;
} else {
mu_m = viscMult(c)*mu_w;
}
@ -162,9 +162,9 @@ namespace Opm
visc_eff[0] = mu_w_eff;
visc_eff[1] = visc[1];
if (if_with_der) {
double mu_w_e_dc = omega*mu_m_dc*std::pow(mu_m, omega - 1)*std::pow(mu_w, 1 - omega);
double mu_p_eff_dc = omega*mu_m_dc*std::pow(mu_m, omega - 1)*std::pow(mu_p, 1 - omega);
dvisc_eff_dc[0] = -1./c_max_*mu_w_eff*mu_w_eff*(1./mu_p_eff - 1./mu_w_e) + (1-cbar)*(mu_w_eff*mu_w_eff/(mu_w_e*mu_w_e))*mu_w_e_dc + cbar*(mu_w_eff*mu_w_eff/(mu_p_eff*mu_p_eff))*mu_p_eff_dc;
double dmu_w_e_dc = omega*dmu_m_dc*std::pow(mu_m, omega - 1)*std::pow(mu_w, 1 - omega);
double dmu_p_eff_dc = omega*dmu_m_dc*std::pow(mu_m, omega - 1)*std::pow(mu_p, 1 - omega);
dvisc_eff_dc[0] = -1./c_max_*mu_w_eff*mu_w_eff*(1./mu_p_eff - 1./mu_w_e) + (1-cbar)*(mu_w_eff*mu_w_eff/(mu_w_e*mu_w_e))*dmu_w_e_dc + cbar*(mu_w_eff*mu_w_eff/(mu_p_eff*mu_p_eff))*dmu_p_eff_dc;
dvisc_eff_dc[1] = 0.;
} else {
dvisc_eff_dc = 0;
@ -256,7 +256,7 @@ namespace Opm
double dvisc_eff_dc[2];
effectiveViscBoth(c, visc, visc_eff, dvisc_eff_dc, if_with_der);
double mu_w_eff = visc_eff[0];
double mu_w_eff_dc = dvisc_eff_dc[0];
double dmu_w_eff_dc = dvisc_eff_dc[0];
double eff_relperm_wat;
double deff_relperm_wat_ds;
double deff_relperm_wat_dc;
@ -268,19 +268,18 @@ namespace Opm
mob[1] = relperm[1]/visc_eff[1];
if (if_with_der) {
dmobwat_dc = - mob[0]*mu_w_eff_dc/(mu_w_eff*mu_w_eff)
dmobwat_dc = - eff_relperm_wat*dmu_w_eff_dc/(mu_w_eff*mu_w_eff)
+ deff_relperm_wat_dc/mu_w_eff;
dmob_ds[0*2 + 0] = deff_relperm_wat_ds/visc_eff[0];
dmob_ds[0*2 + 1] = -dmob_ds[0*2 + 0];
dmob_ds[1*2 + 0] = drelperm_ds[1*2 + 0]/visc_eff[1];
dmob_ds[1*2 + 1] = drelperm_ds[1*2 + 1]/visc_eff[1];
} else {
mob.clear();
dmob_ds.clear();
}
}
void PolymerProperties::computeMcWithDer(const double& c, double& mc) const
void PolymerProperties::computeMc(const double& c, double& mc) const
{
double dummy;
computeMcBoth(c, mc, dummy, false);

View File

@ -858,8 +858,8 @@ namespace Opm
dmob_dc[1] = 0.;
ff = mob[0]/(mob[0] + mob[1]);
if (if_with_der) {
dff_dsdc[0] = (dmob_ds[0]*mob[1] - dmob_ds[1]*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1]));
dff_dsdc[1] = (dmob_dc[0]*mob[1] - dmob_dc[1]*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1]));
dff_dsdc[0] = (dmob_ds[0]*mob[1] - dmob_ds[1]*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1])); // derivative with respect to s
dff_dsdc[1] = (dmob_dc[0]*mob[1] - dmob_dc[1]*mob[0])/((mob[0] + mob[1])*(mob[0] + mob[1])); // derivative with respect to c
} else {
dff_dsdc.clear();
}
@ -867,14 +867,13 @@ namespace Opm
void TransportModelPolymer::computeMc(double c, double& mc) const
{
double dummy;
polyprops_.computeMcBoth(c, mc, dummy, false);
polyprops_.computeMc(c, mc);
}
void TransportModelPolymer::computeMcWithDer(double c, double& mc,
double &dmc_dc) const
{
polyprops_.computeMcBoth(c, mc, dmc_dc, true);
polyprops_.computeMcWithDer(c, mc, dmc_dc);
}
} // namespace Opm