OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-13 17:02:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#3958 Refactoring: Removed result index from NNC data

Browse Source
This commit is contained in:
Jacob Støren committed 2019-01-25 16:19:15 +01:00
1 parent 09011862cd
commit d8eded7d49
10 files changed
+75 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp
+4 -4
View File
@@ -148,7 +148,7 @@ void RivNNCGeometryGenerator::computeArrays()
void RivNNCGeometryGenerator::textureCoordinates(cvf::Vec2fArray* textureCoords,
const cvf::ScalarMapper* mapper,
RiaDefines::ResultCatType resultType,
size_t scalarResultIndex,
const RigEclipseResultAddress& resVarAddr,
size_t nativeTimeStepIndex) const
{
size_t numVertices = m_vertices->size();
@@ -158,15 +158,15 @@ void RivNNCGeometryGenerator::textureCoordinates(cvf::Vec2fArray* textureCoords,
const std::vector<double>* nncResultVals = nullptr;
if (resultType == RiaDefines::STATIC_NATIVE)
{
nncResultVals = m_nncData->staticConnectionScalarResult(scalarResultIndex);
nncResultVals = m_nncData->staticConnectionScalarResult(resVarAddr);
}
else if (resultType == RiaDefines::DYNAMIC_NATIVE)
{
nncResultVals = m_nncData->dynamicConnectionScalarResult(scalarResultIndex, nativeTimeStepIndex);
nncResultVals = m_nncData->dynamicConnectionScalarResult(resVarAddr, nativeTimeStepIndex);
}
else if (resultType == RiaDefines::GENERATED)
{
nncResultVals = m_nncData->generatedConnectionScalarResult(scalarResultIndex, nativeTimeStepIndex);
nncResultVals = m_nncData->generatedConnectionScalarResult(resVarAddr, nativeTimeStepIndex);
}
if (!nncResultVals || nncResultVals->size() == 0)