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

#4668 Make contour time and case diff work

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-09-10 09:18:40 +02:00 committed by Magne Sjaastad
parent b38904d158
commit 25c692d3db
3 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

@ -202,8 +202,11 @@ std::vector<double> RimEclipseContourMapProjection::generateResults(int timeStep
else if (!(cellColors->hasStaticResult() && timeStep > 0))
{
m_currentResultName = cellColors->resultVariable();
RigEclipseResultAddress resAddr(cellColors->resultType(), cellColors->resultVariable());
if (resAddr.isValid() && resultData->hasResultEntry(resAddr))
RigEclipseResultAddress resAddr( cellColors->resultType(),
cellColors->resultVariable(),
cellColors->timeLapseBaseTimeStep(),
cellColors->caseDiffIndex() );
if ( resAddr.isValid() && resultData->hasResultEntry( resAddr ) )
{
gridResultValues = resultData->cellScalarResults(resAddr, timeStep);
}

20
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -968,6 +968,26 @@ QString RimEclipseResultDefinition::diffResultUiShortNameHTML() const
return diffResult.join("<br>");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimEclipseResultDefinition::timeLapseBaseTimeStep() const
{
return m_timeLapseBaseTimestep;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimEclipseResultDefinition::caseDiffIndex() const
{
if ( m_differenceCase )
{
return m_differenceCase->caseId();
}
return -1;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

23
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -98,16 +98,19 @@ public:
QString diffResultUiShortName() const;
QString diffResultUiShortNameHTML() const;
void loadResult();
RigEclipseResultAddress eclipseResultAddress() const;
void setFromEclipseResultAddress(const RigEclipseResultAddress& resultAddress);
bool hasStaticResult() const;
bool hasDynamicResult() const;
bool hasResult() const;
bool isTernarySaturationSelected() const;
bool isCompletionTypeSelected() const;
bool hasCategoryResult() const;
bool isFlowDiagOrInjectionFlooding() const;
int timeLapseBaseTimeStep() const;
int caseDiffIndex() const;
void loadResult();
RigEclipseResultAddress eclipseResultAddress() const;
void setFromEclipseResultAddress( const RigEclipseResultAddress& resultAddress );
bool hasStaticResult() const;
bool hasDynamicResult() const;
bool hasResult() const;
bool isTernarySaturationSelected() const;
bool isCompletionTypeSelected() const;
bool hasCategoryResult() const;
bool isFlowDiagOrInjectionFlooding() const;
RigCaseCellResultsData* currentGridCellResults() const;