OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-23 09:46:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[bugfix] Prevent accessing elements beyond end of NNC entries.

Browse Source
This commit is contained in:
Markus Blatt 2018-12-13 15:28:43 +01:00
parent 362476a494
commit 64326dad53
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ebos/ecltransmissibility.hh
View File

@ -618,11 +618,29 @@ private:
auto candidate = nnc_data.begin();
for ( const auto& edit: editnnc_data )
{
auto print_nnc_warning = [](int c1, int c2){
std::ostringstream sstr;
sstr << "Cannot edit NNC from " << c1 << " to " << c2
<< " as it does not exist";
Opm::OpmLog::warning(sstr.str());
};
if ( candidate == nnc_data.end() )
{
// no more NNCs left
print_nnc_warning(edit.cell1, edit.cell2);
continue;
}
if ( candidate->cell1 != edit.cell1 || candidate->cell2 != edit.cell2 )
{
candidate = std::lower_bound(candidate, nnc_data.end(), NNCdata(edit.cell1, edit.cell2, 0), compare);
if ( candidate == nnc_data.end() )
{
// no more NNCs left
print_nnc_warning(edit.cell1, edit.cell2);
continue;
}
}
while ( candidate->cell1 == edit.cell1 && candidate->cell2 == edit.cell2 )
while ( candidate != nnc_data.end() && candidate->cell1 == edit.cell1 && candidate->cell2 == edit.cell2 )
{
candidate->trans *= edit.trans;
++candidate;