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

Keep all NNCs when processing EDITNNCR.

Browse Source 
Those might still be needed to correctly construct the connections
between cells in the grid. Skipping them will produce wrong grids.
This commit is contained in:
Markus Blatt 2023-04-12 10:16:19 +02:00
parent 1ff9100bdc
commit 9f6122938d
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/opm/input/eclipse/EclipseState/Grid/NNC.cpp
View File

@ -234,14 +234,11 @@ bool is_neighbor(const EclipseGrid& grid, std::size_t g1, std::size_t g2) {
std::back_inserter(slim_edit));
m_edit = std::move(slim_edit);
// Remove corresponding NNC entries in m_input as EDITNNCR
// will overwrite transmissibilities anyway
std::vector<NNCdata> slim_input;
slim_edit.reserve(m_input.size());
std::set_difference(m_input.begin(), m_input.end(),
nnc_editr.begin(), nnc_editr.end(),
std::back_inserter(slim_input));
m_input = std::move(slim_input);
// NNCs are left untouched as they are also needed for
// grid construction. Transmissibilities are overwritten
// in the simulator by EDITNNCR
// Create new container to not use excess memory
m_editr = {nnc_editr.begin(), nnc_editr.end()};
}

8
tests/parser/integration/NNCTests.cpp
View File

@ -234,7 +234,7 @@ DIMENS
GRID
NNC
7 1 1 3 1 1 0.1 / -- Will not be represented internally, because there is a corresponding EDITNNCR
7 1 1 3 1 1 0.1 /
3 1 1 5 1 1 0.1 /
/
@ -270,7 +270,7 @@ EDITNNCR
8 1 1 3 1 1 2.0 /
1 1 1 1 2 1 0.01 / -- This is ignored because the two cells are not ijk neighbours
2 1 1 2 3 1 0.2 / -- Overwritten with 0.3 by next entry
7 1 1 3 1 1 10 / -- Will cause corresponding NNC to not be represented internally
7 1 1 3 1 1 10 /
/
EDITNNCR
@ -413,8 +413,10 @@ BOOST_AUTO_TEST_CASE(readDeck_EDITR)
const std::vector<NNCdata>& editr = nnc.editr();
check_order(nnc);
BOOST_CHECK_EQUAL(input.size(), 1);
BOOST_CHECK_EQUAL(input.size(), 2);
check_nnc(input, grid.getGlobalIndex(2,0,0), grid.getGlobalIndex(4,0,0), 0.1*2.0);
// Not checking value because of corresponding NNCR
BOOST_CHECK(has_nnc(input, grid.getGlobalIndex(6,0,0), grid.getGlobalIndex(2, 0, 0)));
BOOST_CHECK_EQUAL(edit.size(), 1);
BOOST_CHECK(!has_nnc(edit, grid.getGlobalIndex(4,0,0), grid.getGlobalIndex(2,0,0)));