Merge pull request #750 from qilicun/support_minpvf

Support minpvf.
This commit is contained in:
Joakim Hove 2015-02-12 09:34:28 +01:00
commit d6bf9d3a36

View File

@ -156,9 +156,10 @@ namespace Opm
g.actnum = actnum.data();
g.mapaxes = mapaxes.data();
if (!poreVolumes.empty() && eclipseGrid->isMinpvActive()) {
if (!poreVolumes.empty() && (eclipseGrid->getMinpvMode() != MinpvMode::ModeEnum::Inactive)) {
MinpvProcessor mp(g.dims[0], g.dims[1], g.dims[2]);
mp.process(poreVolumes, eclipseGrid->getMinpvValue(), actnum, zcorn.data());
const double minpv_value = eclipseGrid->getMinpvValue();
mp.process(poreVolumes, minpv_value, actnum, zcorn.data());
}
const double z_tolerance = eclipseGrid->isPinchActive() ?