3437ec8b32
The test started failing in commit7d7f62e, but this was not detected due to no automatic test environment. The commit changed the cell numbering from "per-column (K,I,J)-ordering" to "per-plane (I,J,K)-ordering". Consequently, the "correct_answer" seized to be correct. This change restores the "correct_answer" in the ordering introduced by commit7d7f62e. While here, adjust style of the DisjointColumn test case for legibility.
159 lines
5.4 KiB
C++
159 lines
5.4 KiB
C++
|
|
#include <config.h>
|
|
|
|
#if HAVE_DYNAMIC_BOOST_TEST
|
|
#define BOOST_TEST_DYN_LINK
|
|
#endif
|
|
#define NVERBOSE // to suppress our messages when throwing
|
|
|
|
#define BOOST_TEST_MODULE ColumnExtractTest
|
|
#include <boost/test/unit_test.hpp>
|
|
#include <opm/core/utility/ColumnExtract.hpp>
|
|
#include <opm/core/GridManager.hpp>
|
|
#include <opm/core/eclipse/EclipseGridParser.hpp>
|
|
|
|
#include <cstddef>
|
|
|
|
BOOST_AUTO_TEST_CASE(SingleColumnTest)
|
|
{
|
|
using namespace Opm;
|
|
|
|
const int size_x = 1, size_y = 1, size_z = 10;
|
|
GridManager manager(size_x, size_y, size_z);
|
|
|
|
std::vector<std::vector<int> > columns;
|
|
extractColumn(*manager.c_grid(), columns);
|
|
|
|
std::vector<int> correct_answer;
|
|
for (int i = 0; i < 10; ++i) {
|
|
correct_answer.push_back(i);
|
|
}
|
|
|
|
BOOST_CHECK_EQUAL_COLLECTIONS(correct_answer.begin(), correct_answer.end(),
|
|
columns[0].begin(), columns[0].end());
|
|
}
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(FourByFourColumnTest)
|
|
{
|
|
const int size_x = 4, size_y = 4, size_z = 10;
|
|
using namespace Opm;
|
|
GridManager manager(size_x, size_y, size_z);
|
|
|
|
std::vector<std::vector<int> > columns;
|
|
extractColumn(*manager.c_grid(), columns);
|
|
|
|
std::vector<std::vector<int> > correct_answer;
|
|
correct_answer.resize(size_x * size_y);
|
|
for(int i = 0; i < size_x * size_y; i++) {
|
|
for(int j = 0; j < 10; j++) {
|
|
correct_answer[i].push_back( i + j*size_x*size_y);
|
|
}
|
|
}
|
|
|
|
for(int i = 0; i < size_x * size_y; i++) {
|
|
BOOST_CHECK_EQUAL_COLLECTIONS(correct_answer[i].begin(), correct_answer[i].end(),
|
|
columns[i].begin(), columns[i].end());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(DisjointColumn)
|
|
{
|
|
std::string grdecl =
|
|
"SPECGRID \n"
|
|
"3 3 3 1 F \n"
|
|
"/ \n"
|
|
" \n"
|
|
"COORD \n"
|
|
"0.0 0 0 0.0 0 3.0 \n"
|
|
"1.0 0 0 1.0 0 3.0 \n"
|
|
"2.0 0 0 2.0 0 3.0 \n"
|
|
"3.0 0 0 3.0 0 3.0 \n"
|
|
" \n"
|
|
"0.0 1.0 0 0.0 1.0 3.0 \n"
|
|
"1.0 1.0 0 1.0 1.0 3.0 \n"
|
|
"2.0 1.0 0 2.0 1.0 3.0 \n"
|
|
"3.0 1.0 0 3.0 1.0 3.0 \n"
|
|
" \n"
|
|
"0.0 2.0 0 0.0 2.0 3.0 \n"
|
|
"1.0 2.0 0 1.0 2.0 3.0 \n"
|
|
"2.0 2.0 0 2.0 2.0 3.0 \n"
|
|
"3.0 2.0 0 3.0 2.0 3.0 \n"
|
|
" \n"
|
|
"0.0 3.0 0 0.0 3.0 3.0 \n"
|
|
"1.0 3.0 0 1.0 3.0 3.0 \n"
|
|
"2.0 3.0 0 2.0 3.0 3.0 \n"
|
|
"3.0 3.0 0 3.0 3.0 3.0 \n"
|
|
"/ \n"
|
|
" \n"
|
|
"ZCORN \n"
|
|
"36*0.0 \n"
|
|
"72*1.0 \n"
|
|
"72*2.0 \n"
|
|
"36*3.0 \n"
|
|
"/ \n"
|
|
" \n"
|
|
"ACTNUM \n"
|
|
"13*1 \n"
|
|
"0 \n"
|
|
"13*1 \n"
|
|
"/ \n"
|
|
"\n";
|
|
|
|
typedef std::vector< std::vector<int> > VVI;
|
|
|
|
const int correct[][3] = { { 0, 9, 17 } , // 0
|
|
{ 1, 10, 18 } , // 1
|
|
{ 2, 11, 19 } , // 2
|
|
{ 3, 12, 20 } , // 3
|
|
{ 21, - 1, - 1 } , // 4
|
|
{ 5, 13, 22 } , // 5
|
|
{ 6, 14, 23 } , // 6
|
|
{ 7, 15, 24 } , // 7
|
|
{ 8, 16, 25 } , // 8
|
|
{ 4, - 1, - 1 } }; // 9
|
|
|
|
const std::size_t ncol = (sizeof correct) / (sizeof correct[0]);
|
|
|
|
VVI correct_answer(ncol);
|
|
|
|
for (std::size_t i = 0; i < ncol; ++i) {
|
|
for (std::size_t j = 0; j < 3; ++j) {
|
|
correct_answer[i].push_back(correct[i][j]);
|
|
}
|
|
}
|
|
correct_answer[4].resize(1);
|
|
correct_answer[9].resize(1);
|
|
|
|
std::istringstream is(grdecl);
|
|
|
|
Opm::EclipseGridParser deck;
|
|
deck.read(is);
|
|
Opm::GridManager manager(deck);
|
|
|
|
VVI columns;
|
|
Opm::extractColumn(*manager.c_grid(), columns);
|
|
|
|
#if 0
|
|
for (size_t i = 0; i < columns.size(); ++i) {
|
|
for (size_t j = 0; j < columns[i].size(); ++j) {
|
|
std::cout << columns[i][j] << ' ';
|
|
}
|
|
std::cout << '\n';
|
|
}
|
|
#endif
|
|
|
|
BOOST_CHECK_EQUAL(columns.size(), correct_answer.size());
|
|
|
|
for (VVI::iterator
|
|
xb = correct_answer.begin(), xe = correct_answer.end(),
|
|
cb = columns .begin(), ce = columns .end();
|
|
xb != xe; ++xb, ++cb) {
|
|
|
|
BOOST_CHECK_EQUAL_COLLECTIONS((*xb).begin(), (*xb).end(),
|
|
(*cb).begin(), (*cb).end());
|
|
}
|
|
}
|