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

#5593 Saturation Pressure Plot: Clamp time step index

Browse Source
This commit is contained in:
Magne Sjaastad
2020-02-28 11:20:02 +01:00
parent 92e579fa73
commit a612da649c
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.cpp
View File

@@ -30,6 +30,8 @@
#include "cafPdmUiDoubleSliderEditor.h" #include "cafPdmUiDoubleSliderEditor.h"
#include <algorithm>
CAF_PDM_SOURCE_INIT( RimPlotCellPropertyFilter, "RimPlotCellPropertyFilter" ); CAF_PDM_SOURCE_INIT( RimPlotCellPropertyFilter, "RimPlotCellPropertyFilter" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -142,10 +144,12 @@ void RimPlotCellPropertyFilter::updateCellVisibilityFromFilter( size_t timeStepI
RigCaseCellResultsData* cellResultsData = resDef->currentGridCellResults(); RigCaseCellResultsData* cellResultsData = resDef->currentGridCellResults();
if ( !cellResultsData ) return; if ( !cellResultsData ) return;
if ( !resDef->currentGridCellResults()->hasResultEntry( resDef->eclipseResultAddress() ) ) return; RigEclipseResultAddress rigEclipseAddress = resDef->eclipseResultAddress();
const std::vector<double>& cellResultValues = if ( !resDef->currentGridCellResults()->hasResultEntry( rigEclipseAddress ) ) return;
cellResultsData->cellScalarResults( resDef->eclipseResultAddress(), timeStepIndex );
size_t clampedIndex = std::min( timeStepIndex, cellResultsData->timeStepCount( rigEclipseAddress ) - 1 );
const std::vector<double>& cellResultValues = cellResultsData->cellScalarResults( rigEclipseAddress, clampedIndex );
if ( cellResultValues.empty() ) return; if ( cellResultValues.empty() ) return;
const RigActiveCellInfo* actCellInfo = cellResultsData->activeCellInfo(); const RigActiveCellInfo* actCellInfo = cellResultsData->activeCellInfo();
@@ -162,12 +166,12 @@ void RimPlotCellPropertyFilter::updateCellVisibilityFromFilter( size_t timeStepI
return; return;
} }
bool isUsingGlobalActiveIndex = cellResultsData->isUsingGlobalActiveIndex( resDef->eclipseResultAddress() ); bool isUsingGlobalActiveIndex = cellResultsData->isUsingGlobalActiveIndex( rigEclipseAddress );
double lowerBound = m_lowerBound; double lowerBound = m_lowerBound;
double upperBound = m_upperBound; double upperBound = m_upperBound;
size_t cellResultIndex = 0; size_t cellResultIndex = 0;
double scalarValue = 0.0; double scalarValue = 0.0;
FilterModeType currentFilterMode = filterMode(); FilterModeType currentFilterMode = filterMode();
for ( size_t reservoirCellIndex = 0; reservoirCellIndex < totalReservoirCellCount; ++reservoirCellIndex ) for ( size_t reservoirCellIndex = 0; reservoirCellIndex < totalReservoirCellCount; ++reservoirCellIndex )
{ {