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

Merge pull request #1504 from akva2/remove_opmfil

Browse Source 
remove unused enum entry OpmFIL
This commit is contained in:
Atgeirr Flø Rasmussen 2020-02-24 13:31:29 +01:00 committed by GitHub
commit dae7b2f331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ namespace Opm {
enum ModeEnum {
Inactive = 1,
EclSTD = 2,
OpmFIL = 3
};
}
}

6
src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@ -337,12 +337,6 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
m_minpvMode = MinpvMode::ModeEnum::EclSTD;
}
if (deck.hasKeyword<ParserKeywords::MINPVFIL>()) {
const auto& record = deck.getKeyword<ParserKeywords::MINPVFIL>( ).getRecord(0);
const auto& item = record.getItem<ParserKeywords::MINPVFIL::VALUE>( );
std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0));
m_minpvMode = MinpvMode::ModeEnum::OpmFIL;
}
}
void EclipseGrid::initGridFromEGridFile(Opm::EclIO::EclFile& egridfile, std::string fileName){

27
tests/parser/EclipseGridTests.cpp
View File

@ -261,29 +261,6 @@ static Opm::Deck createMinpvCPDeck() {
static Opm::Deck createMinpvFilCPDeck() {
const char* deckData =
"RUNSPEC\n"
"\n"
"DIMENS\n"
" 10 10 10 /\n"
"GRID\n"
"COORD\n"
" 726*1 / \n"
"ZCORN \n"
" 8000*1 / \n"
"ACTNUM \n"
" 1000*1 / \n"
"MINPVFIL \n"
" 20 / \n"
"EDIT\n"
"\n";
Opm::Parser parser;
return parser.parseString( deckData) ;
}
static Opm::Deck createCARTDeck() {
const char* deckData =
"RUNSPEC\n"
@ -877,19 +854,15 @@ BOOST_AUTO_TEST_CASE(ConstructorMINPV) {
auto deck1 = createCPDeck();
auto deck2 = createMinpvDefaultCPDeck();
auto deck3 = createMinpvCPDeck();
auto deck4 = createMinpvFilCPDeck();
Opm::EclipseGrid grid1(deck1);
BOOST_CHECK_THROW(Opm::EclipseGrid grid2(deck2), std::invalid_argument);
Opm::EclipseGrid grid3(deck3);
Opm::EclipseGrid grid4(deck4);
BOOST_CHECK(!grid1.equal( grid3 ));
BOOST_CHECK_EQUAL(grid1.getMinpvMode(), Opm::MinpvMode::ModeEnum::Inactive);
BOOST_CHECK_EQUAL(grid3.getMinpvMode(), Opm::MinpvMode::ModeEnum::EclSTD);
BOOST_CHECK_EQUAL(grid3.getMinpvVector()[0], 10.0);
BOOST_CHECK_EQUAL(grid4.getMinpvMode(), Opm::MinpvMode::ModeEnum::OpmFIL);
BOOST_CHECK_EQUAL(grid4.getMinpvVector()[0], 20.0);
}
static Opm::Deck createActnumDeck() {