From a29a388df212561a5d27780422eb58aee835ac93 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 12 Jun 2014 08:00:28 +0200 Subject: [PATCH] Fixed issue when combining static and dynamic filters Time step index was set to 0 for static results. This was also done for all other filters, which caused dynamic filters to always evaluate time step 0 --- .../ModelVisualization/RivReservoirViewPartMgr.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index e0dbb2bd02..3f78c6d111 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -714,10 +714,12 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis size_t scalarResultIndex = (*pfIt)->resultDefinition->gridScalarIndex(); + size_t adjustedTimeStepIndex = timeStepIndex; + // Set time step to zero for static results if ((*pfIt)->resultDefinition()->hasStaticResult()) { - timeStepIndex = 0; + adjustedTimeStepIndex = 0; } const RimCellFilter::FilterModeType filterType = (*pfIt)->filterMode(); @@ -725,7 +727,7 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel((*pfIt)->resultDefinition()->porosityModel()); RigCaseData* eclipseCase = propFilterColl->reservoirView()->eclipseCase()->reservoirData(); - cvf::ref dataAccessObject = eclipseCase->dataAccessObject(grid, porosityModel, timeStepIndex, scalarResultIndex); + cvf::ref dataAccessObject = eclipseCase->dataAccessObject(grid, porosityModel, adjustedTimeStepIndex, scalarResultIndex); CVF_ASSERT(dataAccessObject.notNull()); //#pragma omp parallel for schedule(dynamic)