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

#4096 Simplify code for loading case and time diff to use same method

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-02-15 13:03:05 +01:00
parent fbd1486a4c
commit eb0c2e4737
2 changed files with 8 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ReservoirDataModel/RigCaseCellResultCalculator.cpp
View File

@@ -44,22 +44,22 @@ bool RigCaseCellResultCalculator::computeDifference(RigEclipseCaseData*
const RigEclipseResultAddress& address)
{
CVF_ASSERT(address.isValid());
CVF_ASSERT(address.hasDifferenceCase());
CVF_ASSERT(address.hasDifferenceCase() || address.isTimeLapse());
// Assume at this stage that data for the case is available
// It is up to the caller to make sure the case is read from file
RigEclipseCaseData* baseCase = nullptr;
RigEclipseCaseData* baseCase = sourceCase;
if (address.hasDifferenceCase())
{
auto eclipseCases = RiaApplication::instance()->project()->eclipseCases();
for (RimEclipseCase* c : eclipseCases)
{
if (c->caseId() == address.m_differenceCaseId)
auto eclipseCases = RiaApplication::instance()->project()->eclipseCases();
for (RimEclipseCase* c : eclipseCases)
{
if (c && c->eclipseCaseData())
if (c && c->caseId() == address.m_differenceCaseId && c->eclipseCaseData())
{
baseCase = c->eclipseCaseData();
baseCase = c->eclipseCaseData();
}
}
}