OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-13 01:41:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2165 from joakim-hove/ecl-eps-grid-extract

Browse Source 
Use EclEpsGridProperties constructor
This commit is contained in:
Joakim Hove 2019-11-21 11:33:24 +01:00 committed by GitHub
commit 02bdf4c699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
View File

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