Skip to content
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

Add non-zero default tolerance to mergeTables #4313

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −2
Open

Add non-zero default tolerance to mergeTables #4313

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
968526b
Add non-zero default tolerance to mergeTables to avoid near-duplicate…
vkip Nov 5, 2024
f393dd2
Change default mergeTables tolerance to 1.0e-7
vkip Nov 5, 2024
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
4 changes: 2 additions & 2 deletions opm/output/eclipse/Tables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,7 @@ namespace { namespace SatFunc {
// tables having sorted phase saturation values (required by ECL
// format).
std::vector<TableElement>
mergeTables(const std::vector<DerivedKroFunction>& t, const double tolerance = 0.0)
mergeTables(const std::vector<DerivedKroFunction>& t, const double tolerance = 1.0e-7)
{
auto ret = std::vector<TableElement>{};

Expand Down Expand Up @@ -2006,7 +2006,7 @@ namespace { namespace SatFunc {
tbl.emplace_back(sg, krog, So_off);
}

const auto mrg = mergeTables(tbl, 1.0e-14);
const auto mrg = mergeTables(tbl);

for (auto& col : ret) { col.reserve(mrg.size()); }

Expand Down