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

Make sure one case is loaded when both SMSPEC and ESMRY is present in same folder

Browse Source
This commit is contained in:
Magne Sjaastad 2023-05-30 14:09:00 +02:00
parent 24ccbf395d
commit fc51bf84a5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/Application/RiaEclipseFileNameTools.cpp
View File

@ -70,6 +70,12 @@ std::vector<QString> RiaEclipseFileNameTools::findSummaryFileCandidates()
auto smryCandidate = relatedFilePath( EclipseFileType::ECLIPSE_SMSPEC ); auto smryCandidate = relatedFilePath( EclipseFileType::ECLIPSE_SMSPEC );
auto esmryCandidate = relatedFilePath( EclipseFileType::ECLIPSE_ESMRY ); auto esmryCandidate = relatedFilePath( EclipseFileType::ECLIPSE_ESMRY );
if ( !smryCandidate.isEmpty() && !esmryCandidate.isEmpty() )
{
// If both files exist, we prefer the SMSPEC file
esmryCandidate = "";
}
return { smryCandidate, esmryCandidate }; return { smryCandidate, esmryCandidate };
} }