OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2034 Update opm-flowdiagnostics to 7e2be931d4

Browse Source 
Remove monkeypatch
Fixes Exception
This commit is contained in:
Jacob Støren 2017-10-27 14:08:02 +02:00
parent dda063cd68
commit 9f9fb21cbe
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ResInsightVersion.cmake
View File

@ -11,7 +11,7 @@ set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")
set(ERT_GITHUB_SHA "2e36798b43daf18c112b91aa3febbf2fccd4a95f")
# https://github.com/OPM/opm-flowdiagnostics
set(OPM_FLOWDIAGNOSTICS_SHA "b0b8bbd32881fa100661cc8da5d4843794a4184a")
set(OPM_FLOWDIAGNOSTICS_SHA "7e2be931d430796ed42efcfb5c6b67a8d5962f7f")
# https://github.com/OPM/opm-flowdiagnostics-applications
set(OPM_FLOWDIAGNOSTICS_APPLICATIONS_SHA "e6ae223fbeb0c9bd83c63a5fb6f57e4a3ad2ec18")

11
ThirdParty/custom-opm-flowdiagnostics/opm-flowdiagnostics/opm/flowdiagnostics/Toolbox.cpp vendored
View File

@ -115,6 +115,8 @@ Toolbox::Impl::assignInflowFlux(const std::map<CellSetID, CellSetValues>& inflow
{
only_inflow_flux_.clear();
only_outflow_flux_.clear();
inj_flux_by_id_.clear();
prod_flux_by_id_.clear();
for (const auto& inflow_set : inflow_flux) {
const CellSetID& id = inflow_set.first;
for (const auto& data : inflow_set.second) {
@ -143,8 +145,7 @@ Toolbox::Impl::injDiag(const std::vector<CellSet>& start_sets)
throw std::runtime_error("Start set ID not present in data passed to assignInflowFlux().");
}
for (const int cell : start) {
if (only_inflow_flux_.count(cell) != 1)// || only_outflow_flux_.count(cell) != 0)
{
if (only_inflow_flux_.count(cell) != 1) {
throw std::runtime_error("Start set inconsistent with assignInflowFlux()-given values");
}
}
@ -184,11 +185,9 @@ Toolbox::Impl::prodDiag(const std::vector<CellSet>& start_sets)
throw std::runtime_error("Start set ID not present in data passed to assignInflowFlux().");
}
for (const int cell : start) {
if (//only_inflow_flux_.count(cell) != 0 ||
only_outflow_flux_.count(cell) != 1 )
{
if (only_outflow_flux_.count(cell) != 1) {
throw std::runtime_error("Start set inconsistent with assignInflowFlux()-given values");
}
}
}
}