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

#6978 Fault Import : Make sure faults in separate text file is imported

Browse Source
This commit is contained in:
Magne Sjaastad
2020-11-13 09:38:44 +01:00
parent 5abf2b3b00
commit f94cd760e5
5 changed files with 103 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -670,7 +670,7 @@ std::vector<QString> RimEclipseCase::additionalFiles() const
/// Loads input property data from the gridFile and additional files
/// Creates new InputProperties if necessary, and flags the unused ones as obsolete
//--------------------------------------------------------------------------------------------------
void RimEclipseCase::loadAndSyncronizeInputProperties( bool includeGridFileName )
void RimEclipseCase::loadAndSyncronizeInputProperties( bool importGridOrFaultData )
{
// Make sure we actually have reservoir data
@@ -685,9 +685,12 @@ void RimEclipseCase::loadAndSyncronizeInputProperties( bool includeGridFileName
filenames.push_back( fileName );
}
if ( includeGridFileName ) filenames.push_back( gridFileName() );
if ( importGridOrFaultData ) filenames.push_back( gridFileName() );
RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( inputPropertyCollection(), eclipseCaseData(), filenames );
RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( inputPropertyCollection(),
eclipseCaseData(),
filenames,
importGridOrFaultData );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@@ -113,7 +113,7 @@ public:
std::set<QString> sortedSimWellNames() const;
void loadAndSyncronizeInputProperties( bool includeGridFileName );
void loadAndSyncronizeInputProperties( bool importGridOrFaultData );
void ensureFaultDataIsComputed();
bool ensureNncDataIsComputed();

8
ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@@ -177,6 +177,12 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames )
this->eclipseCaseData(),
importFaults,
filesToRead );
if ( importFaults )
{
this->ensureFaultDataIsComputed();
}
return true;
}
@@ -215,8 +221,8 @@ bool RimEclipseInputCase::openEclipseGridFile()
this->eclipseCaseData()->mainGrid()->setFlipAxis( m_flipXAxis, m_flipYAxis );
computeCachedData();
loadAndSyncronizeInputProperties( true );
computeCachedData();
}
RiaApplication* app = RiaApplication::instance();