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

Janitor : Support import of stand alone ESMRY files

Browse Source 
All import of summary data was previously started from a SMSPEC file. As the ESMRY file is completely independent, it is useful to import these files directly.
This commit is contained in:
Magne Sjaastad
2021-12-07 14:45:50 +01:00
parent 2800f1f189
commit cf4d2c9ad2
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/Application/RiaDefines.cpp
View File

@@ -288,6 +288,10 @@ RiaDefines::ImportFileType RiaDefines::obtainFileTypeFromFileName( const QString
{ {
return ImportFileType::ECLIPSE_SUMMARY_FILE; return ImportFileType::ECLIPSE_SUMMARY_FILE;
} }
else if ( fileName.endsWith( "ESMRY", Qt::CaseInsensitive ) )
{
return ImportFileType::ECLIPSE_SUMMARY_FILE;
}
else if ( fileName.endsWith( "ODB", Qt::CaseInsensitive ) ) else if ( fileName.endsWith( "ODB", Qt::CaseInsensitive ) )
{ {
return ImportFileType::GEOMECH_ODB_FILE; return ImportFileType::GEOMECH_ODB_FILE;

3
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -625,8 +625,9 @@ std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::createSummaryCasesFro
{ {
const QString& smspecFileName = fileInfo.summaryFileName(); const QString& smspecFileName = fileInfo.summaryFileName();
bool isEsmryFile = smspecFileName.endsWith( "ESMRY" );
bool foundDataFile = RiaEclipseFileNameTools::isSummaryDataFilePresent( smspecFileName ); bool foundDataFile = RiaEclipseFileNameTools::isSummaryDataFilePresent( smspecFileName );
if ( foundDataFile ) if ( foundDataFile || isEsmryFile )
{ {
RimFileSummaryCase* newSumCase = new RimFileSummaryCase(); RimFileSummaryCase* newSumCase = new RimFileSummaryCase();