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

Merge pull request #1956 from goncalvesmachadoc/watvap

Browse Source 
Finalize VAPWAT keyword
This commit is contained in:
Tor Harald Sandve 2021-12-09 15:37:04 +01:00 committed by GitHub
commit e2b0ad581c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/parser/SimulationConfigTest.cpp
View File

@ -96,15 +96,16 @@ const std::string& inputStr_cpr_BOTH = "RUNSPEC\n"
"CPR\n"
"well1 10 20 30/\n/\n";
const std::string& inputStr_vap_dis = "RUNSPEC\n"
"VAPOIL\n"
"DISGAS\n"
"DIMENS\n"
"10 3 4 /\n"
"\n"
"GRID\n"
"REGIONS\n"
"\n";
const std::string& inputStr_vap_dis = R"(
RUNSPEC
VAPOIL
DISGAS
VAPWAT
DIMENS
10 3 4 /
GRID
REGIONS
)";
namespace {
std::string simDeckStringTEMP()
@ -214,25 +215,27 @@ BOOST_AUTO_TEST_CASE(SimulationConfigCPRRUnspecWithData) {
}
BOOST_AUTO_TEST_CASE(SimulationConfig_VAPOIL_DISGAS) {
BOOST_AUTO_TEST_CASE(SimulationConfig_VAPOIL_DISGAS_VAPWAT) {
EclipseGrid eg(10, 3, 4);
auto deck = createDeck(inputStr);
TableManager tm(deck);
EclipseGrid eg(10, 3, 4);
FieldPropsManager fp(deck, Phases{true, true, true}, eg, tm);
SimulationConfig simulationConfig(false, deck, fp);
BOOST_CHECK_EQUAL( false , simulationConfig.hasDISGAS());
BOOST_CHECK_EQUAL( false , simulationConfig.hasVAPOIL());
BOOST_CHECK_EQUAL( false , simulationConfig.hasVAPWAT());
auto deck_vd = createDeck(inputStr_vap_dis);
TableManager tm_vd(deck_vd);
EclipseGrid eg_vd(10, 3, 4);
FieldPropsManager fp_vd(deck_vd, Phases{true, true, true}, eg, tm);
SimulationConfig simulationConfig_vd(false, deck_vd, fp_vd);
BOOST_CHECK_EQUAL( true , simulationConfig_vd.hasDISGAS());
BOOST_CHECK_EQUAL( true , simulationConfig_vd.hasVAPOIL());
BOOST_CHECK_EQUAL( true , simulationConfig_vd.hasVAPWAT());
}
BOOST_AUTO_TEST_CASE(SimulationConfig_TEMP_THERMAL)
{
{