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

Fixed issue when combining static and dynamic filters

Browse Source 
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
This commit is contained in:
Magne Sjaastad 2014-06-12 08:00:28 +02:00
parent 7faf950dc7
commit a29a388df2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -714,10 +714,12 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis
size_t scalarResultIndex = (*pfIt)->resultDefinition->gridScalarIndex(); size_t scalarResultIndex = (*pfIt)->resultDefinition->gridScalarIndex();
size_t adjustedTimeStepIndex = timeStepIndex;
// Set time step to zero for static results // Set time step to zero for static results
if ((*pfIt)->resultDefinition()->hasStaticResult()) if ((*pfIt)->resultDefinition()->hasStaticResult())
{ {
timeStepIndex = 0; adjustedTimeStepIndex = 0;
} }
const RimCellFilter::FilterModeType filterType = (*pfIt)->filterMode(); const RimCellFilter::FilterModeType filterType = (*pfIt)->filterMode();
@ -725,7 +727,7 @@ void RivReservoirViewPartMgr::computePropertyVisibility(cvf::UByteArray* cellVis
RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel((*pfIt)->resultDefinition()->porosityModel()); RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel((*pfIt)->resultDefinition()->porosityModel());
RigCaseData* eclipseCase = propFilterColl->reservoirView()->eclipseCase()->reservoirData(); RigCaseData* eclipseCase = propFilterColl->reservoirView()->eclipseCase()->reservoirData();
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObject = eclipseCase->dataAccessObject(grid, porosityModel, timeStepIndex, scalarResultIndex); cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObject = eclipseCase->dataAccessObject(grid, porosityModel, adjustedTimeStepIndex, scalarResultIndex);
CVF_ASSERT(dataAccessObject.notNull()); CVF_ASSERT(dataAccessObject.notNull());
//#pragma omp parallel for schedule(dynamic) //#pragma omp parallel for schedule(dynamic)