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

Remove unused index member from Box class

Browse Source
This commit is contained in:
Joakim Hove
2020-09-03 16:49:29 +02:00
parent 015d8ff923
commit a5bb313394
3 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Grid/Box.hpp
View File

@@ -53,7 +53,6 @@ namespace Opm {
bool isGlobal() const;
size_t getDim(size_t idim) const;
const std::vector<cell_index>& index_list() const;
const std::vector<size_t>& getIndexList() const;
bool equal(const Box& other) const;
@@ -73,7 +72,6 @@ namespace Opm {
size_t m_offset[3];
bool m_isGlobal;
std::vector<size_t> global_index_list;
std::vector<cell_index> m_index_list;
int lower(int dim) const;

6
src/opm/parser/eclipse/EclipseState/Grid/Box.cpp
View File

@@ -142,17 +142,12 @@ namespace Opm {
const std::vector<size_t>& Box::getIndexList() const {
return global_index_list;
}
const std::vector<Box::cell_index>& Box::index_list() const {
return m_index_list;
}
void Box::initIndexList() {
global_index_list.clear();
m_index_list.clear();
size_t ii,ij,ik;
@@ -164,7 +159,6 @@ namespace Opm {
size_t i = ii + m_offset[0];
size_t g = i * m_stride[0] + j*m_stride[1] + k*m_stride[2];
global_index_list.push_back(g);
if (this->grid.cellActive(g)) {
std::size_t global_index = g;
std::size_t active_index = this->grid.activeIndex(g);

31
tests/parser/BoxTests.cpp
View File

@@ -40,22 +40,6 @@ BOOST_AUTO_TEST_CASE(CreateBox) {
BOOST_CHECK_EQUAL( 2 , box.getDim(2) );
BOOST_CHECK_THROW( box.getDim(5) , std::invalid_argument);
{
size_t i,j,k;
const std::vector<size_t>& indexList = box.getIndexList();
for (k=0; k < box.getDim(2); k++) {
for (j=0; j < box.getDim(1); j++) {
for (i=0; i < box.getDim(0); i++) {
size_t g = i + j*box.getDim(0) + k*box.getDim(0)*box.getDim(1);
BOOST_CHECK_EQUAL( indexList[g] , g);
}
}
}
}
}
@@ -75,21 +59,6 @@ BOOST_AUTO_TEST_CASE(CreateSubBox) {
Opm::Box subBox2(grid, 1,3,1,4,1,5);
BOOST_CHECK( !subBox2.isGlobal());
BOOST_CHECK_EQUAL( 60U , subBox2.size() );
size_t i,j,k;
size_t d = 0;
const std::vector<size_t>& indexList = subBox2.getIndexList();
for (k=0; k < subBox2.getDim(2); k++) {
for (j=0; j < subBox2.getDim(1); j++) {
for (i=0; i < subBox2.getDim(0); i++) {
size_t g = (i + 1) + (j + 1)*globalBox.getDim(0) + (k + 1)*globalBox.getDim(0)*globalBox.getDim(1);
BOOST_CHECK_EQUAL( indexList[d] , g);
d++;
}
}
}
}