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

Use data access object

Browse Source 
p4#: 20336
This commit is contained in:
Magne Sjaastad 2013-02-01 13:34:27 +01:00
parent e635bb5dbb
commit 578e3f7db3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -23,6 +23,7 @@
#include "RigReservoir.h" #include "RigReservoir.h"
#include "RigGridBase.h" #include "RigGridBase.h"
#include "RigReservoirCellResults.h" #include "RigReservoirCellResults.h"
#include "RigGridScalarDataAccess.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -597,7 +598,9 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis
} }
const RimCellFilter::FilterModeType filterType = (*pfIt)->filterMode(); const RimCellFilter::FilterModeType filterType = (*pfIt)->filterMode();
bool useGlobalActiveIndex = grid->mainGrid()->results()->isUsingGlobalActiveIndex((*pfIt)->resultDefinition->gridScalarIndex());
cvf::ref<RigGridScalarDataAccess> dataAccessObject = grid->dataAccessObject(timeStepIndex, scalarResultIndex);
CVF_ASSERT(dataAccessObject.notNull());
#pragma omp parallel for schedule(dynamic) #pragma omp parallel for schedule(dynamic)
for (int cellIndex = 0; cellIndex < static_cast<int>(grid->cellCount()); cellIndex++) for (int cellIndex = 0; cellIndex < static_cast<int>(grid->cellCount()); cellIndex++)
@ -605,12 +608,8 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis
if ( (*cellVisibility)[cellIndex] ) if ( (*cellVisibility)[cellIndex] )
{ {
size_t resultValueIndex = cellIndex; size_t resultValueIndex = cellIndex;
if (useGlobalActiveIndex)
{
resultValueIndex = grid->cell(cellIndex).activeIndexInMatrixModel();
}
double scalarValue = grid->mainGrid()->results()->cellScalarResult(timeStepIndex, scalarResultIndex, resultValueIndex); double scalarValue = dataAccessObject->cellScalar(resultValueIndex);
if (lowerBound <= scalarValue && scalarValue <= upperBound) if (lowerBound <= scalarValue && scalarValue <= upperBound)
{ {
if (filterType == RimCellFilter::EXCLUDE) if (filterType == RimCellFilter::EXCLUDE)