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

Ignore THPRES input for restart runs

Browse Source
This commit is contained in:
Joakim Hove
2018-05-29 16:38:04 +02:00
parent a7ec8b1d53
commit 24f28e8a5d
8 changed files with 110 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/parser/EclipseStateTests.cpp
View File

@@ -245,7 +245,7 @@ BOOST_AUTO_TEST_CASE(CreateSimulationConfig) {
EclipseState state(deck, ParseContext());
const auto& simConf = state.getSimulationConfig();
BOOST_CHECK(simConf.hasThresholdPressure());
BOOST_CHECK(simConf.useThresholdPressure());
BOOST_CHECK_EQUAL(simConf.getThresholdPressure().size(), 3);
}

19
tests/parser/SimulationConfigTest.cpp
View File

@@ -55,6 +55,7 @@ const std::string& inputStr = "RUNSPEC\n"
"/\n"
"\n";
const std::string& inputStr_noTHPRES = "RUNSPEC\n"
"EQLOPTS\n"
"DIMENS\n"
@@ -115,7 +116,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfigGetThresholdPressureTableTest) {
TableManager tm(deck);
EclipseGrid eg(10, 3, 4);
Eclipse3DProperties ep(deck, tm, eg);
BOOST_CHECK_NO_THROW( SimulationConfig( deck, ep ) );
BOOST_CHECK_NO_THROW( SimulationConfig(false, deck, ep ) );
}
@@ -125,8 +126,8 @@ BOOST_AUTO_TEST_CASE(SimulationConfigNOTHPRES) {
TableManager tm(deck);
EclipseGrid eg(10, 3, 4);
Eclipse3DProperties ep(deck, tm, eg);
SimulationConfig simulationConfig(deck, ep);
BOOST_CHECK( !simulationConfig.hasThresholdPressure() );
SimulationConfig simulationConfig(false, deck, ep);
BOOST_CHECK( !simulationConfig.useThresholdPressure() );
}
BOOST_AUTO_TEST_CASE(SimulationConfigCPRNotUsed) {
@@ -135,7 +136,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfigCPRNotUsed) {
TableManager tm(deck);
EclipseGrid eg(10, 3, 4);
Eclipse3DProperties ep(deck, tm, eg);
SimulationConfig simulationConfig(deck, ep);
SimulationConfig simulationConfig(false, deck, ep);
BOOST_CHECK( ! simulationConfig.useCPR());
}
@@ -146,7 +147,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfigCPRUsed) {
EclipseGrid eg(10, 3, 4);
Eclipse3DProperties ep(deck, tm, eg);
SUMMARYSection summary(deck);
SimulationConfig simulationConfig(deck, ep);
SimulationConfig simulationConfig(false, deck, ep);
BOOST_CHECK( simulationConfig.useCPR() );
BOOST_CHECK( ! summary.hasKeyword("CPR") );
}
@@ -159,7 +160,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfigCPRInSUMMARYSection) {
EclipseGrid eg(10, 3, 4);
Eclipse3DProperties ep(deck, tm, eg);
SUMMARYSection summary(deck);
SimulationConfig simulationConfig(deck, ep);
SimulationConfig simulationConfig(false, deck, ep);
BOOST_CHECK( ! simulationConfig.useCPR());
BOOST_CHECK( summary.hasKeyword("CPR"));
}
@@ -172,7 +173,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfigCPRBoth) {
EclipseGrid eg(10, 3, 4);
Eclipse3DProperties ep(deck, tm, eg);
SUMMARYSection summary(deck);
SimulationConfig simulationConfig(deck, ep);
SimulationConfig simulationConfig(false, deck, ep);
BOOST_CHECK( simulationConfig.useCPR());
BOOST_CHECK( summary.hasKeyword("CPR"));
@@ -198,7 +199,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfig_VAPOIL_DISGAS) {
TableManager tm(deck);
EclipseGrid eg(10, 3, 4);
Eclipse3DProperties ep(deck, tm, eg);
SimulationConfig simulationConfig(deck, ep);
SimulationConfig simulationConfig(false, deck, ep);
BOOST_CHECK_EQUAL( false , simulationConfig.hasDISGAS());
BOOST_CHECK_EQUAL( false , simulationConfig.hasVAPOIL());
@@ -206,7 +207,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfig_VAPOIL_DISGAS) {
TableManager tm_vd(deck_vd);
EclipseGrid eg_vd(10, 3, 4);
Eclipse3DProperties ep_vd(deck_vd, tm, eg);
SimulationConfig simulationConfig_vd(deck_vd, ep_vd);
SimulationConfig simulationConfig_vd(false, deck_vd, ep_vd);
BOOST_CHECK_EQUAL( true , simulationConfig_vd.hasDISGAS());
BOOST_CHECK_EQUAL( true , simulationConfig_vd.hasVAPOIL());
}

52
tests/parser/ThresholdPressureTest.cpp
View File

@@ -53,6 +53,32 @@ const std::string& inputStr = "RUNSPEC\n"
"2 3 7.0/\n"
"/\n"
"\n";
const std::string& inputStr_RESTART = "RUNSPEC\n"
"EQLOPTS\n"
"THPRES /\n "
"\n"
"SOLUTION\n"
"RESTART\n"
" CASE 100 /\n"
"\n";
const std::string& inputStr_RESTART2 = "RUNSPEC\n"
"EQLOPTS\n"
"THPRES /\n "
"\n"
"REGIONS\n"
"EQLNUM\n"
" 27*4 /\n"
"SOLUTION\n"
"RESTART\n"
" CASE 100/\n"
"THPRES\n"
"1 3 5.0/\n"
"2 3 33.0 /\n"
"2 4 7.0/\n"
"/\n"
"\n";
const std::string& inputStrWithEqlNum =
"RUNSPEC\n"
@@ -110,6 +136,7 @@ const std::string& inputStrTHPRESinRUNSPECnotSoultion = "RUNSPEC\n"
"\n";
const std::string& inputStrIrrevers = "RUNSPEC\n"
"EQLOPTS\n"
"THPRES IRREVERS/\n "
@@ -184,6 +211,7 @@ struct Setup
TableManager tablemanager;
EclipseGrid grid;
Eclipse3DProperties props;
InitConfig initConfig;
ThresholdPressure threshPres;
explicit Setup(const std::string& input) :
@@ -192,7 +220,8 @@ struct Setup
tablemanager(deck),
grid(10, 3, 4),
props(deck, tablemanager, grid),
threshPres(deck, props)
initConfig(deck),
threshPres(initConfig.restartRequested(), deck, props)
{
}
explicit Setup(const std::string& input, ParseContext& parseContextArg) :
@@ -201,7 +230,8 @@ struct Setup
tablemanager(deck),
grid(10, 3, 4),
props(deck, tablemanager, grid),
threshPres(deck, props)
initConfig(deck),
threshPres(initConfig.restartRequested(), deck, props)
{
}
@@ -259,6 +289,24 @@ BOOST_AUTO_TEST_CASE(ThresholdPressureThrowTest) {
BOOST_CHECK_THROW(s.threshPres.getThresholdPressure(2, 3), std::invalid_argument);
}
BOOST_AUTO_TEST_CASE(Restart) {
Setup sx(inputStr_RESTART);
BOOST_CHECK(sx.threshPres.active());
BOOST_CHECK_EQUAL(sx.threshPres.size(), 0);
BOOST_CHECK(sx.threshPres.restart());
}
BOOST_AUTO_TEST_CASE(Restart2) {
Setup sx(inputStr_RESTART2);
BOOST_CHECK(sx.threshPres.active());
BOOST_CHECK_EQUAL(sx.threshPres.size(), 3);
BOOST_CHECK(sx.threshPres.restart());
}
BOOST_AUTO_TEST_CASE(HasPair) {
Setup s(inputStrWithEqlNum);