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

#2318 Added workaround that guards initialization of relative permeability evaluation library since opening of special EGRID file causes exception in library and crash

Browse Source
This commit is contained in:
sigurdp 2018-01-05 11:00:23 +01:00
parent 0939cff93a
commit 434d03b9d7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
View File

@ -130,8 +130,14 @@ public:
m_hasUnifiedRestartFile = false; m_hasUnifiedRestartFile = false;
m_poreVolume = m_eclGraph->poreVolume(); m_poreVolume = m_eclGraph->poreVolume();
//m_eclSaturationFunc.reset(new Opm::ECLSaturationFunc(*m_eclGraph, initData)); try
m_eclSaturationFunc.reset(new Opm::ECLSaturationFunc(*m_eclGraph, initData, true, Opm::ECLSaturationFunc::InvalidEPBehaviour::IgnorePoint)); {
m_eclSaturationFunc.reset(new Opm::ECLSaturationFunc(*m_eclGraph, initData, true, Opm::ECLSaturationFunc::InvalidEPBehaviour::IgnorePoint));
}
catch (...)
{
RiaLogging::warning("Exception during initialization of relative permeability plotting functionality. Functionality will not be available.");
}
try try
{ {
@ -607,7 +613,10 @@ std::vector<RigFlowDiagSolverInterface::RelPermCurve> RigFlowDiagSolverInterface
} }
CVF_ASSERT(m_opmFlowDiagStaticData.notNull()); CVF_ASSERT(m_opmFlowDiagStaticData.notNull());
CVF_ASSERT(m_opmFlowDiagStaticData->m_eclSaturationFunc); if (!m_opmFlowDiagStaticData->m_eclSaturationFunc)
{
return retCurveArr;
}
const Opm::ECLSaturationFunc::RawCurve krw { Opm::ECLSaturationFunc::RawCurve::Function::RelPerm, Opm::ECLSaturationFunc::RawCurve::SubSystem::OilWater, Opm::ECLPhaseIndex::Aqua }; // water rel-perm in oil-water system const Opm::ECLSaturationFunc::RawCurve krw { Opm::ECLSaturationFunc::RawCurve::Function::RelPerm, Opm::ECLSaturationFunc::RawCurve::SubSystem::OilWater, Opm::ECLPhaseIndex::Aqua }; // water rel-perm in oil-water system
const Opm::ECLSaturationFunc::RawCurve krg { Opm::ECLSaturationFunc::RawCurve::Function::RelPerm, Opm::ECLSaturationFunc::RawCurve::SubSystem::OilGas, Opm::ECLPhaseIndex::Vapour }; // gas rel-perm in oil-gas system const Opm::ECLSaturationFunc::RawCurve krg { Opm::ECLSaturationFunc::RawCurve::Function::RelPerm, Opm::ECLSaturationFunc::RawCurve::SubSystem::OilGas, Opm::ECLPhaseIndex::Vapour }; // gas rel-perm in oil-gas system