Use EclEpsGridProperties constructor

This commit is contained in:
Joakim Hove 2019-11-18 12:22:35 +01:00
parent 930f80b8c3
commit 571c24d10c

View File

@ -23,10 +23,12 @@
#include <vector> #include <vector>
#include <utility> #include <utility>
#include <opm/material/fluidmatrixinteractions/EclEpsGridProperties.hpp>
#include <opm/core/props/satfunc/RelpermDiagnostics.hpp> #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
#include <opm/grid/utility/compressedToCartesian.hpp> #include <opm/grid/utility/compressedToCartesian.hpp>
#include <opm/grid/GridHelpers.hpp> #include <opm/grid/GridHelpers.hpp>
namespace Opm { namespace Opm {
template <class GridT> template <class GridT>
@ -54,8 +56,7 @@ namespace Opm {
const auto dims = Opm::UgGridHelpers::cartDims(grid); const auto dims = Opm::UgGridHelpers::cartDims(grid);
const auto& compressedToCartesianIdx = Opm::compressedToCartesian(nc, global_cell); const auto& compressedToCartesianIdx = Opm::compressedToCartesian(nc, global_cell);
scaledEpsInfo_.resize(nc); scaledEpsInfo_.resize(nc);
EclEpsGridProperties epsGridProperties; EclEpsGridProperties epsGridProperties(eclState, false);
epsGridProperties.initFromDeck(deck, eclState, /*imbibition=*/false);
const auto& satnumData = eclState.get3DProperties().getIntGridProperty("SATNUM").getData(); const auto& satnumData = eclState.get3DProperties().getIntGridProperty("SATNUM").getData();
const std::string tag = "Scaled endpoints"; const std::string tag = "Scaled endpoints";
for (int c = 0; c < nc; ++c) { for (int c = 0; c < nc; ++c) {