OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Test case working again with new fluid.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-05-16 16:31:05 +02:00
parent cc1f8ed21a
commit f822cb4739
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
opm/autodiff/ImpesTPFAAD.hpp
View File

@ -417,9 +417,11 @@ namespace Opm {
const ADB cell_b = fluidFvf(phase, p, cells); const ADB cell_b = fluidFvf(phase, p, cells);
const ADB cell_rho = fluidRho(phase, p, cells); const ADB cell_rho = fluidRho(phase, p, cells);
const V kr = fluidKr(phase); const V kr = fluidKr(phase);
const ADB mu = fluidMu(phase, p, cells); // const ADB mu = fluidMu(phase, p, cells);
const V mu = fluidMu(phase, p.value(), cells);
const ADB mf = upwind.select(kr / mu); // const ADB mf = upwind.select(kr / mu);
const V mf = upwind.select(kr / mu);
const ADB flux = mf * (nkgradp + (grav_ * cell_rho)); const ADB flux = mf * (nkgradp + (grav_ * cell_rho));
const ADB face_b = upwind.select(cell_b); const ADB face_b = upwind.select(cell_b);
@ -501,8 +503,10 @@ namespace Opm {
// const V kr = pdepfdata_.phaseRelPerm(phase); // const V kr = pdepfdata_.phaseRelPerm(phase);
// const ADB mu = pdepfdata_.phaseViscosity(phase, p); // const ADB mu = pdepfdata_.phaseViscosity(phase, p);
const V kr = fluidKr(phase); const V kr = fluidKr(phase);
const ADB mu = fluidMu(phase, p, cells); // const ADB mu = fluidMu(phase, p, cells);
const V mf = upwind.select(kr / mu.value()); // const V mf = upwind.select(kr / mu.value());
const V mu = fluidMu(phase, p.value(), cells);
const V mf = upwind.select(kr / mu);
flux += mf * head; flux += mf * head;
} }
@ -511,6 +515,21 @@ namespace Opm {
} }
V fluidMu(const int phase, const V& p, const std::vector<int>& cells) const
{
switch (phase) {
case Water:
return fluid_.muWat(p, cells);
case Oil: {
V dummy_rs = V::Zero(p.size(), 1) * p;
return fluid_.muOil(p, dummy_rs, cells);
}
case Gas:
return fluid_.muGas(p, cells);
default:
THROW("Unknown phase index " << phase);
}
}
ADB fluidMu(const int phase, const ADB& p, const std::vector<int>& cells) const ADB fluidMu(const int phase, const ADB& p, const std::vector<int>& cells) const
{ {
switch (phase) { switch (phase) {