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

OPM-218: Fixed corresponding tests

Browse Source
This commit is contained in:
chflo
2015-07-27 10:48:18 +02:00
parent 1251484b32
commit 36279ae421
2 changed files with 70 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp
View File

@@ -172,10 +172,10 @@ BOOST_AUTO_TEST_CASE(IOConfigTest) {
frequency = 0;
ioConfigPtr->handleRPTRSTBasic(schedule.getTimeMap(),timestep, basic, frequency);
/*Expected results: Write timestep for timestep 17, 20, 22, 23, 26*/
/*Expected results: Write timestep for timestep 20, 22, 23, 26*/
for (size_t ts = 17; ts <= 26; ++ts) {
if ((17 == ts) || (20 == ts) || (22 == ts) || (23 == ts) || (26 == ts)) {
if ((20 == ts) || (22 == ts) || (23 == ts) || (26 == ts)) {
BOOST_CHECK_EQUAL(true, ioConfigPtr->getWriteRestartFile(ts));
} else {
BOOST_CHECK_EQUAL(false, ioConfigPtr->getWriteRestartFile(ts));
@@ -202,10 +202,10 @@ BOOST_AUTO_TEST_CASE(IOConfigTest) {
frequency = 2;
ioConfigPtr->handleRPTRSTBasic(schedule.getTimeMap(), timestep, basic, frequency);
/*Expected results: Write timestep for timestep 27, 32, 36 */
//Expected results: Write timestep for 30 and 33 (30, 32, 33, 36 with frequency 2)
for (size_t ts = 27; ts <= 36; ++ts) {
if ((27 == ts) || (32 == ts) || (36 == ts)) {
if ((30 == ts) || (33 == ts)) {
BOOST_CHECK_EQUAL(true, ioConfigPtr->getWriteRestartFile(ts));
} else {
BOOST_CHECK_EQUAL(false, ioConfigPtr->getWriteRestartFile(ts));
@@ -233,10 +233,10 @@ BOOST_AUTO_TEST_CASE(IOConfigTest) {
frequency = 2;
ioConfigPtr->handleRPTRSTBasic(schedule.getTimeMap(), timestep, basic, frequency);
/*Expected results: Write timestep for timestep 37, 42 */
//Expected results: Write timestep for timestep 38, 44 (38, 42, 44 with frequency 2)
for (size_t ts = 37; ts <= 46; ++ts) {
if ((37 == ts) || (42 == ts)) {
if ((38 == ts) || (44 == ts)) {
BOOST_CHECK_EQUAL(true, ioConfigPtr->getWriteRestartFile(ts));
} else {
BOOST_CHECK_EQUAL(false, ioConfigPtr->getWriteRestartFile(ts));

79
opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp
View File

@@ -269,29 +269,78 @@ BOOST_AUTO_TEST_CASE(TimeStepsCorrect) {
boost::posix_time::milliseconds(123)));
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/8), 6*24*60*60);
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/9), 7*24*60*60);
}
BOOST_AUTO_TEST_CASE(initTimestepsYearsAndMonths) {
const char *deckData =
"START\n"
" 21 MAY 1981 /\n"
"\n"
"TSTEP\n"
" 1 2 3 4 5 /\n"
"\n"
"DATES\n"
" 5 JUL 1981 /\n"
" 6 JUL 1981 /\n"
" 5 AUG 1981 /\n"
" 5 SEP 1981 /\n"
" 1 OCT 1981 /\n"
" 1 NOV 1981 /\n"
" 1 DEC 1981 /\n"
" 1 JAN 1982 /\n"
" 1 JAN 1982 13:55:44 /\n"
" 3 JAN 1982 14:56:45.123 /\n"
"/\n"
"\n"
"TSTEP\n"
" 6 7 /\n";
Opm::ParserPtr parser(new Opm::Parser(/*addDefault=*/true));
Opm::DeckPtr deck = parser->parseString(deckData);
Opm::TimeMap tmap(deck);
/*deckData timesteps:
0 21 may 1981 START
1 22 may 1981
2 24 may 1981
3 27 may 1981
4 31 may 1981
5 5 jun 1981
6 5 jul 1981
7 6 jul 1981
8 5 aug 1981
9 5 sep 1981
10 1 oct 1981
11 1 nov 1981
12 1 dec 1981
13 1 jan 1982
14 1 jan 1982
15 3 jan 1982
16 9 jan 1982
17 16 jan 1982
*/
std::vector<size_t> first_timestep_of_each_month;
tmap.initFirstTimestepsMonths(first_timestep_of_each_month);
BOOST_CHECK_EQUAL(3, first_timestep_of_each_month.size());
int expected_results[3] = {0,5,6};
BOOST_CHECK_EQUAL_COLLECTIONS(expected_results, expected_results+3, first_timestep_of_each_month.begin(), first_timestep_of_each_month.end());
BOOST_CHECK_EQUAL(8, first_timestep_of_each_month.size());
int expected_results[8] = {5,6,8,9,10,11,12,13};
BOOST_CHECK_EQUAL_COLLECTIONS(expected_results, expected_results+8, first_timestep_of_each_month.begin(), first_timestep_of_each_month.end());
first_timestep_of_each_month.clear();
tmap.initFirstTimestepsMonths(first_timestep_of_each_month, 5);
BOOST_CHECK_EQUAL(2, first_timestep_of_each_month.size());
int expected_results2[2] = {5,6};
BOOST_CHECK_EQUAL_COLLECTIONS(expected_results2, expected_results2+2, first_timestep_of_each_month.begin(), first_timestep_of_each_month.end());
tmap.initFirstTimestepsMonths(first_timestep_of_each_month, 6);
BOOST_CHECK_EQUAL(6, first_timestep_of_each_month.size());
int expected_results3[6] = {8,9,10,11,12,13};
BOOST_CHECK_EQUAL_COLLECTIONS(expected_results3, expected_results3+6, first_timestep_of_each_month.begin(), first_timestep_of_each_month.end());
std::vector<size_t> first_timestep_of_each_year;
tmap.initFirstTimestepsYears(first_timestep_of_each_year);
BOOST_CHECK_EQUAL(2, first_timestep_of_each_year.size());
int expected_results_years[2] = {0,6};
BOOST_CHECK_EQUAL_COLLECTIONS(expected_results_years, expected_results_years+2, first_timestep_of_each_year.begin(), first_timestep_of_each_year.end());
BOOST_CHECK_EQUAL(1, first_timestep_of_each_year.size());
int expected_results_years[1] = {13};
BOOST_CHECK_EQUAL_COLLECTIONS(expected_results_years, expected_results_years+1, first_timestep_of_each_year.begin(), first_timestep_of_each_year.end());
first_timestep_of_each_year.clear();
tmap.initFirstTimestepsYears(first_timestep_of_each_year, 6);
BOOST_CHECK_EQUAL(1, first_timestep_of_each_year.size());
BOOST_CHECK_EQUAL(6, first_timestep_of_each_year[0]);
tmap.initFirstTimestepsYears(first_timestep_of_each_year, 13);
BOOST_CHECK_EQUAL(0, first_timestep_of_each_year.size());
}