From dbaa510c89f76a18a005a7002aa3bcc647273f44 Mon Sep 17 00:00:00 2001 From: Runar Date: Wed, 16 Oct 2019 10:07:41 +0200 Subject: [PATCH] Renamed functions in opm/grid/polyhedralgrid/grid.hh after changes in previous commit in opm-common --- opm/grid/polyhedralgrid/grid.hh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/opm/grid/polyhedralgrid/grid.hh b/opm/grid/polyhedralgrid/grid.hh index f23d63e08..d7fdfde54 100644 --- a/opm/grid/polyhedralgrid/grid.hh +++ b/opm/grid/polyhedralgrid/grid.hh @@ -797,19 +797,15 @@ namespace Dune const auto eclipseGrid = std::make_shared(deck, rawactnum); struct grdecl g; - std::vector actnum; - std::vector coord; - std::vector zcorn; - std::vector mapaxes; g.dims[0] = eclipseGrid->getNX(); g.dims[1] = eclipseGrid->getNY(); g.dims[2] = eclipseGrid->getNZ(); - - eclipseGrid->exportMAPAXES( mapaxes ); - eclipseGrid->exportCOORD( coord ); - eclipseGrid->exportZCORN( zcorn ); - eclipseGrid->exportACTNUM( actnum ); + + std::vector mapaxes = eclipseGrid->getMAPAXES( ); + std::vector coord = eclipseGrid->getCOORD( ); + std::vector zcorn = eclipseGrid->getZCORN( ); + std::vector actnum = eclipseGrid->getACTNUM( ); g.coord = coord.data(); g.zcorn = zcorn.data(); @@ -826,7 +822,7 @@ namespace Dune const size_t cartGridSize = g.dims[0] * g.dims[1] * g.dims[2]; std::vector thickness(cartGridSize); for (size_t i = 0; i < cartGridSize; ++i) { - thickness[i] = eclipseGrid->getCellThicknes(i); + thickness[i] = eclipseGrid->getCellThickness(i); } const double z_tolerance = eclipseGrid->isPinchActive() ? eclipseGrid->getPinchThresholdThickness() : 0.0; mp.process(thickness, z_tolerance, poreVolumes, minpvv, actnum, opmfil, zcorn.data());