Skip to content

fixed: up to 3 cells are added, so resize to 3 to avoid oob warnings #996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akva2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed: up to 3 cells are added, so resize to 3 to avoid oob warnings #996

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions opm/grid/cpgrid/processEclipseFormat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
#include <algorithm>
#include <array>
#include <cstddef>
#include <fstream>
#include <initializer_list>
#include <iostream>
#include <memory>
Expand Down Expand Up @@ -1114,18 +1113,16 @@ namespace cpgrid
buildFaceToCellNNC(output, nnc[ExplicitNNC], global_to_local, f2c, face_to_output_face);
}
int nf = output.number_of_faces;
cpgrid::EntityRep<0> cells[2];
// int next_skip_zmin_face = -1; // Not currently used, see comments further down.
for (int i = 0; i < nf; ++i) {
std::vector<cpgrid::EntityRep<0>> cells{};
cells.reserve(3);
const int* fnc = output.face_neighbors + 2*i;
int cellcount = 0;
if (fnc[0] != -1) {
cells[cellcount].setValue(fnc[0], true);
++cellcount;
cells.emplace_back(fnc[0], true);
}
if (fnc[1] != -1) {
cells[cellcount].setValue(fnc[1], false);
++cellcount;
cells.emplace_back(fnc[1], false);
}
if (output.face_tag[i] == K_FACE ) {
if (fnc[1] == -1 ) {
Expand All @@ -1136,8 +1133,7 @@ namespace cpgrid
auto it = nnc[PinchNNC].lower_bound({global_cell[fnc[0]], 0});
if (it != nnc[PinchNNC].end() && it->first == global_cell[fnc[0]]) {
const int other_cell = global_to_local[it->second];
cells[cellcount].setValue(other_cell, false);
++cellcount;
cells.emplace_back(other_cell, false);
// Now we must ensure that the face connecting
// the second cell to the boundary is skipped,
// it is considered replaced by the connection
Expand Down Expand Up @@ -1166,9 +1162,9 @@ namespace cpgrid
// Assertation below is no longer true, due to periodic_extension etc.
// Instead, the appendRow() is put inside an if test.
// assert(cellcount == 1 || cellcount == 2);
if (cellcount > 0) {
std::sort(cells, cells + cellcount);
f2c.appendRow(cells, cells + cellcount);
if (!cells.empty()) {
std::sort(cells.begin(), cells.end());
f2c.appendRow(cells.begin(), cells.end());
face_to_output_face.push_back(i);
}
}
Expand Down