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

Merge pull request #402 from totto82/minpvv

Browse Source 
add support for minpvv
This commit is contained in:
Joakim Hove 2018-10-25 09:04:54 +02:00 committed by GitHub
commit 709723d7ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebos/eclproblem.hh
View File

@ -1657,12 +1657,12 @@ private:
// conserved, cells are not disabled due to a too small pore volume because // conserved, cells are not disabled due to a too small pore volume because
// such cells still store and conduct energy. // such cells still store and conduct energy.
if (!enableEnergy && eclGrid.getMinpvMode() == Opm::MinpvMode::ModeEnum::OpmFIL) { if (!enableEnergy && eclGrid.getMinpvMode() == Opm::MinpvMode::ModeEnum::OpmFIL) {
Scalar minPvValue = eclGrid.getMinpvValue(); const std::vector<Scalar>& minPvVector = eclGrid.getMinpvVector();
for (int aboveElemCartIdx = static_cast<int>(cartElemIdx) - nx*ny; for (int aboveElemCartIdx = static_cast<int>(cartElemIdx) - nx*ny;
aboveElemCartIdx >= 0; aboveElemCartIdx >= 0;
aboveElemCartIdx -= nx*ny) aboveElemCartIdx -= nx*ny)
{ {
if (porvData[aboveElemCartIdx] >= minPvValue) if (porvData[aboveElemCartIdx] >= minPvVector[aboveElemCartIdx])
// the cartesian element above exhibits a pore volume which larger or // the cartesian element above exhibits a pore volume which larger or
// equal to the minimum one // equal to the minimum one
break; break;

2
ebos/ecltransmissibility.hh
View File

@ -682,7 +682,7 @@ private:
int cartesianCellIdxAbove = cartesianCellIdx - nxny; int cartesianCellIdxAbove = cartesianCellIdx - nxny;
while ( cartesianCellIdxAbove >= 0 && while ( cartesianCellIdxAbove >= 0 &&
actnum[cartesianCellIdxAbove] > 0 && actnum[cartesianCellIdxAbove] > 0 &&
porv[cartesianCellIdxAbove] < eclGrid.getMinpvValue() ) { porv[cartesianCellIdxAbove] < eclGrid.getMinpvVector()[cartesianCellIdxAbove] ) {
// Volume weighted arithmetic average of NTG // Volume weighted arithmetic average of NTG
const double cellAboveVolume = eclGrid.getCellVolume(cartesianCellIdxAbove); const double cellAboveVolume = eclGrid.getCellVolume(cartesianCellIdxAbove);