OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove public method EclipseGrid::getMAPUNITS()

Browse Source
This commit is contained in:
Joakim Hove
2021-05-04 07:48:23 +02:00
parent a6d574581d
commit d3f2f593eb
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
View File

@@ -171,7 +171,6 @@ namespace Opm {
const std::vector<double>& getCOORD() const;
const std::vector<double>& getZCORN() const;
const std::vector<int>& getACTNUM( ) const;
const std::string& getMAPUNITS() const { return m_mapunits; } ;
/*
The fixupZCORN method is run as part of constructiong the grid. This will adjust the

10
tests/parser/EclipseGridTests.cpp
View File

@@ -2814,8 +2814,6 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_2) {
BOOST_CHECK( actGrid1[n] == 1 );
}
BOOST_CHECK( grid1.getMAPUNITS() == "" );
auto deck2 = parser.parseString( deckData2) ;
Opm::EclipseGrid grid2( deck2);
@@ -2828,16 +2826,12 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_2) {
BOOST_CHECK( actGrid2[n] == ref_act_egrid[n] );
}
BOOST_CHECK( grid2.getMAPUNITS() == "" );
auto deck3a = parser.parseString( deckData3a) ;
Opm::EclipseGrid grid3a( deck3a);
// mapunits and mapaxes define in deck (only)
BOOST_CHECK( grid3a.getMAPUNITS() == "FEET" );
std::vector<int> actGrid3 = grid3a.getACTNUM();
// check that actnum is reset from gdfile, ACTNUM input in deck
@@ -2858,8 +2852,6 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_2) {
// mapunits and mapaxes both in egrid and deck. Uses properties
// from the egrid keyword gdfile input after MAPUNITS and MAPAXES
BOOST_CHECK( grid3b.getMAPUNITS() == "METRES" );
actGrid3 = grid3b.getACTNUM();
// check that actnum is reset from deck since input after keyword GDFILE
@@ -2878,8 +2870,6 @@ BOOST_AUTO_TEST_CASE(TEST_GDFILE_2) {
auto deck3c = parser.parseString( deckData3c) ;
Opm::EclipseGrid grid3c( deck3c);
BOOST_CHECK( grid3c.getMAPUNITS() == "FEET" );
}
BOOST_AUTO_TEST_CASE(TEST_COLLAPSED_CELL) {