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 remote-tracking branch 'origin/patch_2021.10.3' into dev

Browse Source
This commit is contained in:
Magne Sjaastad
2022-03-28 09:06:38 +02:00
parent f41c772f03 7c4e81f59f
commit 9c987855f2
17 changed files with 164 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

@@ -219,8 +219,10 @@ std::vector<double> RimEclipseContourMapProjection::generateResults( int timeSte
}
gridResultValues = calculateColumnResult( m_resultAggregation() );
}
else if ( !( cellColors->hasStaticResult() && timeStep > 0 ) )
else
{
if ( cellColors->hasStaticResult() && timeStep > 0 ) timeStep = 0;
m_currentResultName = cellColors->resultVariable();
RigEclipseResultAddress resAddr( cellColors->resultType(),
cellColors->resultVariable(),