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

test read name

Browse Source
This commit is contained in:
goncalvesmachadoc
2023-02-23 10:19:34 +01:00
parent 4c93e18971
commit 7c29f6c2a5
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opm/input/eclipse/EclipseState/Grid/Carfin.hpp
View File

@@ -101,6 +101,7 @@ namespace Opm
std::array<std::size_t, 3> m_dims{};
std::array<std::size_t, 3> m_offset{};
std::array<std::size_t, 3> m_end_offset{};
std::string name_grid;
std::vector<cell_index> m_active_index_list;
std::vector<cell_index> m_global_index_list;

8
src/opm/input/eclipse/EclipseState/Grid/Carfin.cpp
View File

@@ -154,6 +154,8 @@ namespace Opm
assert_dims(name, j1 , j2, ny, this->m_globalGridDims_.getNY());
assert_dims(name, k1 , k2, nz, this->m_globalGridDims_.getNZ());
this->name_grid = name;
this->m_dims[0] = nx;
this->m_dims[1] = ny;
this->m_dims[2] = nz;
@@ -249,9 +251,9 @@ namespace Opm
return m_dims[dim];
}
// std::string Carfin::NAME() const {
// return ?;
// }
std::string Carfin::NAME() const {
return name_grid;
}
int Carfin::I1() const {
return lower(0);

2
tests/parser/data/integration_tests/CARFIN/CARFINTEST1
View File

@@ -12,7 +12,7 @@ ENDFIN
CARFIN
-- NAME I1-I2 J1-J2 K1-K2 NX NY NZ
'LGR2' 7 8 7 8 1 3 6 6 9 /
'LGR2' 7 8 7 8 1 3 8 8 9 /
ENDFIN

25
tests/parser/integration/CarfinTest.cpp
View File

@@ -51,25 +51,11 @@ EclipseState makeState(const std::string& fileName) {
}
BOOST_AUTO_TEST_CASE( PARSE_CARFIN_OK ) {
EclipseState state = makeState( prefix() + "CARFIN/CARFINTEST1" );
{
size_t i, j, k;
const EclipseGrid& grid = state.getInputGrid();
for (k = 0; k < grid.getNZ(); k++) {
for (j = 0; j < grid.getNY(); j++) {
for (i = 0; i < grid.getNX(); i++) {
}
}
}
}
}
BOOST_AUTO_TEST_CASE( CONSTRUCTOR_AND_UPDATE ) {
auto deck = makeDeck( prefix() + "CARFIN/CARFINTEST1" );
EclipseGrid grid(deck);
const auto& carfin_keyword = deck["CARFIN"][0];
const auto& carfin_keyword1 = deck["CARFIN"][0];
const auto& carfin_keyword2 = deck["CARFIN"][1];
Carfin lgr(grid,
[&grid](const std::size_t global_index)
{
@@ -79,9 +65,14 @@ BOOST_AUTO_TEST_CASE( CONSTRUCTOR_AND_UPDATE ) {
{
return grid.activeIndex(global_index);
});
lgr.update(carfin_keyword.getRecord(0));
lgr.update(carfin_keyword1.getRecord(0));
BOOST_CHECK_EQUAL(lgr.size(), 324);
lgr.reset();
BOOST_CHECK_EQUAL(lgr.size(), 1000);
lgr.update(carfin_keyword2.getRecord(0));
BOOST_CHECK_EQUAL(lgr.size(), 576);
BOOST_CHECK_EQUAL(lgr.NAME(), "LGR2");
}