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

#2852 OPM. Updated flow diag solver interface after OPM upgrade

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-05-07 14:43:24 +02:00
parent ff628fa9dd
commit e4aa7d681d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
View File

@@ -132,7 +132,7 @@ public:
try try
{ {
m_eclSaturationFunc.reset(new Opm::ECLSaturationFunc(*m_eclGraph, initData, true, Opm::ECLSaturationFunc::InvalidEPBehaviour::IgnorePoint)); m_eclSaturationFunc.reset(new Opm::ECLSaturationFunc(*m_eclGraph, initData));
} }
catch (...) catch (...)
{ {
@@ -676,7 +676,13 @@ std::vector<RigFlowDiagSolverInterface::RelPermCurve> RigFlowDiagSolverInterface
for (RelPermCurve::EpsMode epsMode : epsModeArr) for (RelPermCurve::EpsMode epsMode : epsModeArr)
{ {
const bool useEps = epsMode == RelPermCurve::EPS_ON ? true : false; const bool useEps = epsMode == RelPermCurve::EPS_ON ? true : false;
std::vector<Opm::FlowDiagnostics::Graph> graphArr = m_opmFlowDiagStaticData->m_eclSaturationFunc->getSatFuncCurve(satFuncRequests, static_cast<int>(activeCellIndex), useEps);
Opm::ECLSaturationFunc::SatFuncScaling scaling;
if (!useEps) {
scaling.enable = static_cast<unsigned char>(0);
}
scaling.invalid = Opm::SatFunc::EPSEvalInterface::InvalidEndpointBehaviour::IgnorePoint;
std::vector<Opm::FlowDiagnostics::Graph> graphArr = m_opmFlowDiagStaticData->m_eclSaturationFunc->getSatFuncCurve(satFuncRequests, static_cast<int>(activeCellIndex), scaling);
for (size_t i = 0; i < graphArr.size(); i++) for (size_t i = 0; i < graphArr.size(); i++)
{ {
const RelPermCurve::Ident curveIdent = curveIdentNameArr[i].first; const RelPermCurve::Ident curveIdent = curveIdentNameArr[i].first;