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

#8375 Flow Vectors : Avoid recomputing NNCs when accessing flow data

Browse Source 
Avoid include of RigNNCData.h in header files.
This commit is contained in:
Magne Sjaastad
2021-12-17 12:44:06 +01:00
parent d82fa7f72b
commit 891a2e7c29
24 changed files with 124 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/UserInterface/RiuCellAndNncPickEventHandler.cpp
View File

@@ -217,7 +217,7 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
if ( eclipseView )
{
RigMainGrid* mainGrid = eclipseView->eclipseCase()->eclipseCaseData()->mainGrid();
const RigConnection& nncConn = mainGrid->nncData()->connections()[nncIndex];
const RigConnection& nncConn = mainGrid->nncData()->allConnections()[nncIndex];
mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( nncConn.c1GlobIdx(), &gridLocalCellIndex );
}
@@ -308,7 +308,7 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
selectedItem->m_nncIndex == nncIndex )
{
RigMainGrid* mainGrid = eclipseView->eclipseCase()->eclipseCaseData()->mainGrid();
const RigConnection& nncConn = mainGrid->nncData()->connections()[nncIndex];
const RigConnection& nncConn = mainGrid->nncData()->allConnections()[nncIndex];
size_t c1LocalIdx = cvf::UNDEFINED_SIZE_T;
const RigGridBase* grid1 = mainGrid->gridAndGridLocalIdxFromGlobalCellIdx(nncConn.c1GlobIdx(), &c1LocalIdx);

9
ApplicationLibCode/UserInterface/RiuResultTextBuilder.cpp
View File

@@ -23,6 +23,7 @@
#include "RigEclipseCaseData.h"
#include "RigFormationNames.h"
#include "RigMainGrid.h"
#include "RigNNCData.h"
#include "RigResultAccessor.h"
#include "RigResultAccessorFactory.h"
#include "RigSimWellData.h"
@@ -444,9 +445,9 @@ QString RiuResultTextBuilder::nncResultText()
RigNNCData* nncData = grid->nncData();
CVF_ASSERT( nncData );
if ( nncData && m_nncIndex < nncData->connections().size() )
if ( nncData && m_nncIndex < nncData->allConnections().size() )
{
const RigConnection& conn = nncData->connections()[m_nncIndex];
const RigConnection& conn = nncData->allConnections()[m_nncIndex];
cvf::StructGridInterface::FaceEnum face( conn.face() );
@@ -800,11 +801,11 @@ QString RiuResultTextBuilder::nncDetails()
RigNNCData* nncData = grid->nncData();
CVF_ASSERT( nncData );
if ( nncData && m_nncIndex < nncData->connections().size() )
if ( nncData && m_nncIndex < nncData->allConnections().size() )
{
text += "-- NNC details --\n";
{
const RigConnection& conn = nncData->connections()[m_nncIndex];
const RigConnection& conn = nncData->allConnections()[m_nncIndex];
cvf::StructGridInterface::FaceEnum face( conn.face() );
// First cell of NNC