OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-27 15:41:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Release 2025.09.0

Browse Source
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-09-01 12:38:48 +02:00
1 parent c33402f5ea
commit 917136fec8
1053 files changed
+61952 -11833
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/FileInterface/RifReaderFmuRft.cpp
+6 -5
View File
@@ -87,8 +87,7 @@ bool RifReaderFmuRft::directoryContainsFmuRftData( const QString& filePath )
}
QStringList obsFiles;
obsFiles << "*.obs"
<< "*.txt";
obsFiles << "*.obs" << "*.txt";
QFileInfoList fileInfos = dir.entryInfoList( obsFiles, QDir::Files, QDir::Name );
bool foundObsFile = false;
@@ -260,13 +259,15 @@ void RifReaderFmuRft::importData()
};
// The text file name can be either <wellName>_<measurementId>.txt or <wellName>.txt
QString txtFile = findFileName( wellName, "txt", measurementId, dir );
auto locations = importLocations( dir.absoluteFilePath( txtFile ) );
QString txtFile = findFileName( wellName, "txt", measurementId, dir );
if ( !QFile::exists( txtFile ) ) continue;
auto locations = importLocations( dir.absoluteFilePath( txtFile ) );
if ( locations.empty() ) continue;
// The observation file name can be either <wellName>_<measurementId>.obs or <wellName>.obs
QString observationFileName = findFileName( wellName, "obs", measurementId, dir );
if ( observationFileName.isEmpty() ) continue;
if ( !QFile::exists( observationFileName ) ) continue;
for ( const auto& wellDate : wellDates )
{