#3958 Refactoring: Removed result index from NNC data

This commit is contained in:
Jacob Støren
2019-01-23 16:08:25 +01:00
parent 09011862cd
commit d8eded7d49
10 changed files with 75 additions and 73 deletions

View File

@@ -429,14 +429,14 @@ QString RiuResultTextBuilder::nncResultText()
const std::vector<double>* nncValues = nullptr;
if (resultType == RiaDefines::STATIC_NATIVE)
{
nncValues = nncData->staticConnectionScalarResult(eclipseResultAddress.scalarResultIndex);
nncValues = nncData->staticConnectionScalarResult(eclipseResultAddress);
}
else if (resultType == RiaDefines::DYNAMIC_NATIVE)
{
if (m_reservoirView.notNull() && m_reservoirView->eclipseCase())
{
size_t nativeTimeStep = m_reservoirView->eclipseCase()->uiToNativeTimeStepIndex(m_timeStepIndex);
nncValues = nncData->dynamicConnectionScalarResult(eclipseResultAddress.scalarResultIndex, nativeTimeStep);
nncValues = nncData->dynamicConnectionScalarResult(eclipseResultAddress, nativeTimeStep);
}
}
if (nncValues && (m_nncIndex < nncValues->size()))