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 index bug in data access

Browse Source 
p4#: 20498
This commit is contained in:
Magne Sjaastad
2013-02-13 11:47:29 +01:00
parent a0d6890aa3
commit f14c03f172
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

@@ -502,7 +502,7 @@ void RigGridBase::setMatrixModelActiveCellCount(size_t activeMatrixModelCellCoun
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RigGridBase::mainGridCellIndex(size_t localGridCellIndex) const
size_t RigGridBase::globalGridCellIndex(size_t localGridCellIndex) const
{
return m_indexToStartOfCells + localGridCellIndex;
}

2
ApplicationCode/ReservoirDataModel/RigGridBase.h
View File

@@ -49,7 +49,7 @@ public:
RigCell& cell(size_t gridCellIndex);
const RigCell& cell(size_t gridCellIndex) const;
size_t mainGridCellIndex(size_t localGridCellIndex) const;
size_t globalGridCellIndex(size_t localGridCellIndex) const;
void setIndexToStartOfCells(size_t indexToStartOfCells) { m_indexToStartOfCells = indexToStartOfCells; }
void setGridIndex(size_t index) { m_gridIndex = index; }

10
ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp
View File

@@ -144,9 +144,8 @@ public:
{
if (m_resultValues->size() == 0 ) return HUGE_VAL;
size_t mainGridCellIndex = m_grid->cell(cellIndex).mainGridCellIndex();
size_t resultValueIndex = m_activeCellInfo->activeIndexInMatrixModel(mainGridCellIndex);
size_t globalGridCellIndex = m_grid->globalGridCellIndex(cellIndex);
size_t resultValueIndex = m_activeCellInfo->activeIndexInMatrixModel(globalGridCellIndex);
if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
if (m_resultValues->size() <= resultValueIndex) return HUGE_VAL;
@@ -179,9 +178,8 @@ public:
{
if (m_resultValues->size() == 0 ) return HUGE_VAL;
size_t mainGridCellIndex = m_grid->cell(cellIndex).mainGridCellIndex();
size_t resultValueIndex = m_activeCellInfo->activeIndexInFractureModel(mainGridCellIndex);
size_t globalGridCellIndex = m_grid->globalGridCellIndex(cellIndex);
size_t resultValueIndex = m_activeCellInfo->activeIndexInFractureModel(globalGridCellIndex);
if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
if (m_resultValues->size() <= resultValueIndex) return HUGE_VAL;