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

Import faults when using omp common file reader, too

Browse Source
This commit is contained in:
jonjenssen
2024-02-19 14:09:08 +01:00
committed by jonjenssen
parent 8fe82423ae
commit 9ac4b38cae
7 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -379,14 +379,13 @@ bool RifReaderEclipseOutput::open( const QString& fileName, RigEclipseCaseData*
if ( !RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName( fileName, &fileSet ) ) return false;
m_fileName = fileName;
m_fileName = fileName;
m_filesWithSameBaseName = fileSet;
}
ecl_grid_type* mainEclGrid = nullptr;
{
auto task = progress.task( "Open Init File and Load Main Grid", 19 );
// Keep the set of files of interest
m_filesWithSameBaseName = fileSet;
openInitFile();
@@ -608,39 +607,6 @@ const size_t* RifReaderEclipseOutput::eclipseCellIndexMapping()
return cellMappingECLRi;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseOutput::importFaults( const QStringList& fileSet, cvf::Collection<RigFault>* faults )
{
if ( !filenamesWithFaults().empty() )
{
for ( size_t i = 0; i < filenamesWithFaults().size(); i++ )
{
QString faultFilename = filenamesWithFaults()[i];
RifEclipseInputFileTools::parseAndReadFaults( faultFilename, faults );
}
}
else
{
foreach ( QString fname, fileSet )
{
if ( fname.endsWith( ".DATA" ) )
{
std::vector<QString> filenamesWithFaults;
RifEclipseInputFileTools::readFaultsInGridSection( fname, faults, &filenamesWithFaults, faultIncludeFileAbsolutePathPrefix() );
std::sort( filenamesWithFaults.begin(), filenamesWithFaults.end() );
std::vector<QString>::iterator last = std::unique( filenamesWithFaults.begin(), filenamesWithFaults.end() );
filenamesWithFaults.erase( last, filenamesWithFaults.end() );
setFilenamesWithFaults( filenamesWithFaults );
}
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------