BUGFIX. Use the modified NTG values in multiplyHalfIntersections_(..)

This commit is contained in:
Tor Harald Sandve 2016-08-08 13:20:50 +02:00
parent 5581771917
commit b468d2baa1

View File

@ -141,9 +141,6 @@ namespace Opm
tpfa_loc_trans_compute_(grid,eclgrid, props.permeability(),htrans); tpfa_loc_trans_compute_(grid,eclgrid, props.permeability(),htrans);
} }
std::vector<double> mult;
multiplyHalfIntersections_(grid, eclState, ntg, htrans, mult);
// Use volume weighted arithmetic average of the NTG values for // Use volume weighted arithmetic average of the NTG values for
// the cells effected by the current OPM cpgrid process algorithm // the cells effected by the current OPM cpgrid process algorithm
// for MINPV. Note that the change does not effect the pore volume calculations // for MINPV. Note that the change does not effect the pore volume calculations
@ -154,12 +151,16 @@ namespace Opm
opmfil = true; opmfil = true;
if (opmfil) { if (opmfil) {
minPvFillProps_(grid, eclState, ntg); minPvFillProps_(grid, eclState, ntg);
} else if (eclgrid->isPinchActive()) { }
std::vector<double> mult;
multiplyHalfIntersections_(grid, eclState, ntg, htrans, mult);
if (!opmfil && eclgrid->isPinchActive()) {
// opmfil is hardcoded to be true. i.e the pinch processor is never used // opmfil is hardcoded to be true. i.e the pinch processor is never used
pinchProcess_(grid, *eclState, htrans, numCells); pinchProcess_(grid, *eclState, htrans, numCells);
} }
// combine the half-face transmissibilites into the final face // combine the half-face transmissibilites into the final face
// transmissibilites. // transmissibilites.
tpfa_trans_compute(ug, htrans.data(), trans_.data()); tpfa_trans_compute(ug, htrans.data(), trans_.data());