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

#478 Allowed static results (INIT-file) to not have values for LGRs

Browse Source
This commit is contained in:
Jacob Støren
2016-08-22 17:00:57 +02:00
parent b305202a35
commit 5260a3f870
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp
View File

@@ -44,9 +44,12 @@ double RigActiveCellsResultAccessor::cellScalar(size_t gridLocalCellIndex) const
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);
if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
CVF_TIGHT_ASSERT(resultValueIndex < m_reservoirResultValues->size());
if (resultValueIndex < m_reservoirResultValues->size())
return m_reservoirResultValues->at(resultValueIndex);
return m_reservoirResultValues->at(resultValueIndex);
CVF_TIGHT_ASSERT(resultValueIndex < m_activeCellInfo->reservoirActiveCellCount()); // Because some static results might lack LGR data
return HUGE_VAL;
}
//--------------------------------------------------------------------------------------------------
@@ -67,9 +70,12 @@ double RigActiveCellsResultAccessor::cellScalarGlobIdx(size_t reservoirCellIndex
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);
if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
CVF_TIGHT_ASSERT(resultValueIndex < m_reservoirResultValues->size());
if(resultValueIndex < m_reservoirResultValues->size())
return m_reservoirResultValues->at(resultValueIndex);
return m_reservoirResultValues->at(resultValueIndex);
CVF_TIGHT_ASSERT(resultValueIndex < m_activeCellInfo->reservoirActiveCellCount()); // Because some static results might lack LGR data
return HUGE_VAL;
}
//--------------------------------------------------------------------------------------------------