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

Merge pull request #4690 from OPM/bug-#4688-contour-diff

Browse Source 
#4668 Make contour time and case diff work
This commit is contained in:
Gaute Lindkvist 2019-09-11 08:58:06 +02:00 committed by GitHub
commit 6de86013ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

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

20
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

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

3
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -106,6 +106,9 @@ public:
QString diffResultUiShortName() const; QString diffResultUiShortName() const;
QString diffResultUiShortNameHTML() const; QString diffResultUiShortNameHTML() const;
int timeLapseBaseTimeStep() const;
int caseDiffIndex() const;
void loadResult(); void loadResult();
RigEclipseResultAddress eclipseResultAddress() const; RigEclipseResultAddress eclipseResultAddress() const;
void setFromEclipseResultAddress( const RigEclipseResultAddress& resultAddress ); void setFromEclipseResultAddress( const RigEclipseResultAddress& resultAddress );