diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index 0a11e13f55..a8bf27e8d0 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -464,7 +464,7 @@ bool RifReaderEclipseOutput::open( const QString& fileName, RigEclipseCaseData* { auto subNncTask = nncProgress.task( "Processing connections", 8 ); - eclipseCase->mainGrid()->nncData()->processConnections( *( eclipseCase->mainGrid() ) ); + eclipseCase->mainGrid()->nncData()->processNativeConnections( *( eclipseCase->mainGrid() ) ); } } } diff --git a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp index 5eef0a73c7..f9e9716393 100644 --- a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp +++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp @@ -556,7 +556,7 @@ void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo ) } } - this->nncData()->computeNncsFromFaults( this ); + this->nncData()->computeCompleteSetOfNncs( this ); distributeNNCsToFaults(); } diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp index 2da3216935..4e71d558e7 100644 --- a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp @@ -33,7 +33,7 @@ RigNNCData::RigNNCData() {} //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigNNCData::processConnections( const RigMainGrid& mainGrid ) +void RigNNCData::processNativeConnections( const RigMainGrid& mainGrid ) { // cvf::Trace::show("NNC: Total number: " + cvf::String((int)m_connections.size())); @@ -77,7 +77,7 @@ void RigNNCData::processConnections( const RigMainGrid& mainGrid ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigNNCData::computeNncsFromFaults( const RigMainGrid* mainGrid ) +void RigNNCData::computeCompleteSetOfNncs( const RigMainGrid* mainGrid ) { m_nativeConnectionCount = m_connections.size(); diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.h b/ApplicationCode/ReservoirDataModel/RigNNCData.h index 8a73d69a63..fceecd086a 100644 --- a/ApplicationCode/ReservoirDataModel/RigNNCData.h +++ b/ApplicationCode/ReservoirDataModel/RigNNCData.h @@ -47,8 +47,8 @@ public: RigNNCData(); - void processConnections( const RigMainGrid& mainGrid ); - void computeNncsFromFaults( const RigMainGrid* mainGrid ); + void processNativeConnections( const RigMainGrid& mainGrid ); + void computeCompleteSetOfNncs( const RigMainGrid* mainGrid ); void setConnections( std::vector& connections );