Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Renamed functions in opm/grid/polyhedralgrid/grid.hh after changes in previous commit in opm-common #399

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Renamed functions in opm/grid/polyhedralgrid/grid.hh after changes in previous commit in opm-common #399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 6 additions & 10 deletions opm/grid/polyhedralgrid/grid.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,19 +797,15 @@ namespace Dune
const auto eclipseGrid = std::make_shared<Opm::EclipseGrid>(deck, rawactnum);

struct grdecl g;
std::vector<int> actnum;
std::vector<double> coord;
std::vector<double> zcorn;
std::vector<double> 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<double> mapaxes = eclipseGrid->getMAPAXES( );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these can be const refs afaict.

std::vector<double> coord = eclipseGrid->getCOORD( );
std::vector<double> zcorn = eclipseGrid->getZCORN( );
std::vector<int> actnum = eclipseGrid->getACTNUM( );

g.coord = coord.data();
g.zcorn = zcorn.data();
Expand All @@ -826,7 +822,7 @@ namespace Dune
const size_t cartGridSize = g.dims[0] * g.dims[1] * g.dims[2];
std::vector<double> 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());
Expand Down