OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-15 01:53:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5273 Allen Diagrams: Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2020-01-17 08:39:06 +01:00
parent fa791d0568
commit 3eb43342af
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -464,7 +464,7 @@ bool RifReaderEclipseOutput::open( const QString& fileName, RigEclipseCaseData*
{ {
auto subNncTask = nncProgress.task( "Processing connections", 8 ); auto subNncTask = nncProgress.task( "Processing connections", 8 );
eclipseCase->mainGrid()->nncData()->processConnections( *( eclipseCase->mainGrid() ) ); eclipseCase->mainGrid()->nncData()->processNativeConnections( *( eclipseCase->mainGrid() ) );
} }
} }
} }

2
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@ -556,7 +556,7 @@ void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo )
} }
} }
this->nncData()->computeNncsFromFaults( this ); this->nncData()->computeCompleteSetOfNncs( this );
distributeNNCsToFaults(); distributeNNCsToFaults();
} }

4
ApplicationCode/ReservoirDataModel/RigNNCData.cpp
View File

@ -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())); // 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(); m_nativeConnectionCount = m_connections.size();

4
ApplicationCode/ReservoirDataModel/RigNNCData.h
View File

@ -47,8 +47,8 @@ public:
RigNNCData(); RigNNCData();
void processConnections( const RigMainGrid& mainGrid ); void processNativeConnections( const RigMainGrid& mainGrid );
void computeNncsFromFaults( const RigMainGrid* mainGrid ); void computeCompleteSetOfNncs( const RigMainGrid* mainGrid );
void setConnections( std::vector<RigConnection>& connections ); void setConnections( std::vector<RigConnection>& connections );