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

Only active cells (#1298)

Browse Source 
Use FieldProps implementation for 3D properties
This commit is contained in:
Joakim Hove
2020-01-13 15:46:06 +01:00
committed by GitHub
parent 13b3d1e17b
commit ecb5fce19b
45 changed files with 340 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/parser/ACTIONX.cpp
View File

@@ -127,21 +127,20 @@ TSTEP
auto deck3 = parser.parseString(WITH_GRID);
EclipseGrid grid1(10,10,10);
TableManager table ( deck1 );
Eclipse3DProperties eclipseProperties ( deck1 , table, grid1);
FieldPropsManager fp( deck1 , grid1, table);
Runspec runspec (deck1);
// The ACTIONX keyword has no matching 'ENDACTIO' -> exception
BOOST_CHECK_THROW(Schedule(deck1, grid1, fp, eclipseProperties, runspec ), std::invalid_argument);
BOOST_CHECK_THROW(Schedule(deck1, grid1, fp, runspec ), std::invalid_argument);
Schedule sched(deck2, grid1, fp, eclipseProperties, runspec);
Schedule sched(deck2, grid1, fp, runspec);
BOOST_CHECK( !sched.hasWell("W1") );
BOOST_CHECK( sched.hasWell("W2"));
// The deck3 contains the 'GRID' keyword in the ACTIONX block - that is not a whitelisted keyword.
ParseContext parseContext( {{ParseContext::ACTIONX_ILLEGAL_KEYWORD, InputError::THROW_EXCEPTION}} );
ErrorGuard errors;
BOOST_CHECK_THROW(Schedule(deck3, grid1, fp, eclipseProperties, runspec, parseContext, errors), std::invalid_argument);
BOOST_CHECK_THROW(Schedule(deck3, grid1, fp, runspec, parseContext, errors), std::invalid_argument);
}
@@ -222,11 +221,10 @@ TSTEP
auto deck = parser.parseString(deck_string);
EclipseGrid grid1(10,10,10);
TableManager table ( deck );
Eclipse3DProperties eclipseProperties ( deck , table, grid1);
FieldPropsManager fp( deck , grid1, table);
Runspec runspec(deck);
return Schedule(deck, grid1, fp, eclipseProperties, runspec);
return Schedule(deck, grid1, fp, runspec);
}
@@ -693,11 +691,10 @@ TSTEP
auto deck = parser.parseString(deck_string);
EclipseGrid grid1(10,10,10);
TableManager table ( deck );
Eclipse3DProperties eclipseProperties ( deck , table, grid1);
FieldPropsManager fp( deck , grid1, table);
Runspec runspec (deck);
Schedule sched(deck, grid1, fp, eclipseProperties, runspec);
Schedule sched(deck, grid1, fp, runspec);
const auto& actions0 = sched.actions(0);
BOOST_CHECK_EQUAL(actions0.size(), 0);