Merge pull request #223 from totto82/porv

Remove the check if porv is present in the Eclipsestate.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-10-27 10:28:32 +01:00
commit 16951bbd39
2 changed files with 2 additions and 8 deletions

View File

@ -129,10 +129,7 @@ try
} }
// Grid init // Grid init
std::vector<double> porv; std::vector<double> porv = eclipseState->getDoubleGridProperty("PORV")->getData();
if (eclipseState->hasDoubleGridProperty("PORV")) {
porv = eclipseState->getDoubleGridProperty("PORV")->getData();
}
grid.reset(new GridManager(eclipseState->getEclipseGrid(), porv)); grid.reset(new GridManager(eclipseState->getEclipseGrid(), porv));
auto &cGrid = *grid->c_grid(); auto &cGrid = *grid->c_grid();
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck); const PhaseUsage pu = Opm::phaseUsageFromDeck(deck);

View File

@ -156,10 +156,7 @@ try
// Grid init // Grid init
grid.reset(new Dune::CpGrid()); grid.reset(new Dune::CpGrid());
std::vector<double> porv; std::vector<double> porv = eclipseState->getDoubleGridProperty("PORV")->getData();
if (eclipseState->hasDoubleGridProperty("PORV")) {
porv = eclipseState->getDoubleGridProperty("PORV")->getData();
}
grid->processEclipseFormat(deck, false, false, false, porv); grid->processEclipseFormat(deck, false, false, false, porv);
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck); const PhaseUsage pu = Opm::phaseUsageFromDeck(deck);