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

Address issues from review.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2019-07-02 16:58:04 +02:00
parent 33783b1e9f
commit 522db6d093
3 changed files with 80 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
tests/parser/FoamTests.cpp
View File

@@ -95,6 +95,70 @@ SATNUM
return parser.parseString( deckData );
}
static Deck createFailingDeck() {
// Using a raw string literal with xxx as delimiter.
const char *deckData = R"xxx(
RUNSPEC
DIMENS
10 10 10 /
TABDIMS
3 /
GRID
DX
1000*0.25 /
DY
1000*0.25 /
DZ
1000*0.25 /
TOPS
100*0.25 /
FAULTS
'F1' 1 1 1 4 1 4 'X' /
'F2' 5 5 1 4 1 4 'X-' /
/
MULTFLT
'F1' 0.50 /
'F2' 0.50 /
/
EDIT
MULTFLT /
'F2' 0.25 /
/
WATER
OIL
GAS
FOAM
TITLE
The title
START
8 MAR 1998 /
PROPS
FOAMFSC
1 2 0.3 /
4 5 /
6 /
-- This will fail, as FOAMROCK is missing
REGIONS
SWAT
1000*1 /
SATNUM
1000*2 /
)xxx"; // End of raw string literal with xxx as delimiter.
Parser parser;
return parser.parseString( deckData );
}
BOOST_AUTO_TEST_CASE(FoamConfigTest) {
auto deck = createDeck();
@@ -104,19 +168,24 @@ BOOST_AUTO_TEST_CASE(FoamConfigTest) {
BOOST_CHECK_EQUAL(fc.getRecord(0).referenceSurfactantConcentration(), 1.0);
BOOST_CHECK_EQUAL(fc.getRecord(0).exponent(), 2.0);
BOOST_CHECK_EQUAL(fc.getRecord(0).minimumSurfactantConcentration(), 0.3);
BOOST_CHECK(fc.getRecord(0).allowDesorption() == FoamData::FoamAllowDesorption::Yes);
BOOST_CHECK(fc.getRecord(0).allowDesorption());
BOOST_CHECK_EQUAL(fc.getRecord(0).rockDensity(), 2000.0);
BOOST_CHECK_EQUAL(fc.getRecord(1).referenceSurfactantConcentration(), 4.0);
BOOST_CHECK_EQUAL(fc.getRecord(1).exponent(), 5.0);
BOOST_CHECK_EQUAL(fc.getRecord(1).minimumSurfactantConcentration(), 1e-20); // Defaulted.
BOOST_CHECK(fc.getRecord(1).allowDesorption() == FoamData::FoamAllowDesorption::No);
BOOST_CHECK(!fc.getRecord(1).allowDesorption());
BOOST_CHECK_EQUAL(fc.getRecord(1).rockDensity(), 1800.0);
BOOST_CHECK_EQUAL(fc.getRecord(2).referenceSurfactantConcentration(), 6.0);
BOOST_CHECK_EQUAL(fc.getRecord(2).exponent(), 1.0); // Defaulted.
BOOST_CHECK_EQUAL(fc.getRecord(2).minimumSurfactantConcentration(), 1e-20); // Defaulted.
BOOST_CHECK(fc.getRecord(2).allowDesorption() == FoamData::FoamAllowDesorption::No);
BOOST_CHECK(!fc.getRecord(2).allowDesorption());
BOOST_CHECK_EQUAL(fc.getRecord(2).rockDensity(), 2400.0);
}
BOOST_AUTO_TEST_CASE(FoamConfigFailureTest) {
auto deck = createFailingDeck();
BOOST_CHECK_THROW(EclipseState state(deck), std::runtime_error);
}