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

EclipseGrid: ensure that all ACTNUM manipulations use resetACTNUM

Browse Source
This commit is contained in:
Joakim Hove
2020-04-07 19:01:50 +02:00
parent afd0ed21ba
commit 650ffb12b8
3 changed files with 60 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/parser/EclipseGridTests.cpp
View File

@@ -740,50 +740,6 @@ BOOST_AUTO_TEST_CASE(TestCP_example) {
}
BOOST_AUTO_TEST_CASE(ACTNUM_BEST_EFFORT) {
const char* deckData1 =
"RUNSPEC\n"
"\n"
"DIMENS\n"
" 10 10 10 /\n"
"GRID\n"
"COORD\n"
" 726*1 / \n"
"ZCORN \n"
" 8000*1 / \n"
"ACTNUM \n"
" 100*1 /\n"
"EDIT\n"
"\n";
const char* deckData2 =
"RUNSPEC\n"
"\n"
"DIMENS\n"
" 10 10 10 /\n"
"GRID\n"
"COORD\n"
" 726*1 / \n"
"ZCORN \n"
" 8000*1 / \n"
"ACTNUM \n"
" 100*1 800*0 100*1 /\n"
"EDIT\n"
"\n";
Opm::Parser parser;
auto deck1 = parser.parseString( deckData1) ;
auto deck2 = parser.parseString( deckData2) ;
Opm::EclipseGrid grid1(deck1);
// Actnum vector is too short - ignored
BOOST_CHECK_EQUAL( 1000U , grid1.getNumActive());
Opm::EclipseGrid grid2(deck2);
BOOST_CHECK_EQUAL( 200U , grid2.getNumActive());
}
BOOST_AUTO_TEST_CASE(ConstructorNORUNSPEC) {
const char* deckData =
@@ -2223,8 +2179,8 @@ BOOST_AUTO_TEST_CASE(TESTCP_ACTNUM_UPDATE) {
BOOST_CHECK( actGrid1.size() == actGrid2.size());
for (size_t n=0; n< actGrid1.size(); n++) {
BOOST_CHECK( actGrid1[n] == actInDeck[n]);
BOOST_CHECK( actGrid2[n] == newAct[n]);
BOOST_CHECK_EQUAL( actGrid1[n], actInDeck[n]);
BOOST_CHECK_EQUAL( actGrid2[n], newAct[n]);
}
}