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

RFT: Improve text import and make sure visibility based on date is working

Browse Source 
Find candidate for the observation file name including measurement ID. Make sure that observations are filtered by date.
This commit is contained in:
Magne Sjaastad
2023-11-01 13:11:03 +01:00
parent 2069ad55cf
commit a61e62707b
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationLibCode/FileInterface/RifReaderFmuRft.cpp
View File

@@ -122,7 +122,7 @@ std::vector<QString> RifReaderFmuRft::labels( const RifEclipseRftAddress& rftAdd
for ( const auto& observation : m_observations )
{
if ( observation.wellDate.wellName == rftAddress.wellName() )
if ( observation.wellDate.wellName == rftAddress.wellName() && observation.wellDate.dateTime == rftAddress.timeStep() )
{
formationLabels.push_back(
QString( "%1 - Pressure: %2 +/- %3" ).arg( observation.location.formation ).arg( observation.pressure ).arg( observation.pressureError ) );
@@ -183,7 +183,7 @@ void RifReaderFmuRft::values( const RifEclipseRftAddress& rftAddress, std::vecto
for ( const auto& observation : m_observations )
{
if ( observation.wellDate.wellName == rftAddress.wellName() )
if ( observation.wellDate.wellName == rftAddress.wellName() && observation.wellDate.dateTime == rftAddress.timeStep() )
{
switch ( rftAddress.wellLogChannel() )
{
@@ -238,23 +238,19 @@ void RifReaderFmuRft::importData()
for ( const auto& [wellName, measurementCount] : nameAndMeasurementCount )
{
QString txtFile = QString( "%1.txt" ).arg( wellName );
auto locations = importLocations( dir.absoluteFilePath( txtFile ) );
if ( locations.empty() ) continue;
for ( int i = 0; i < measurementCount; i++ )
{
int measurementId = i + 1;
auto findObservationFileName = []( const QString& wellName, int measurementId, const QDir& dir ) -> QString
auto findFileName = []( const QString& wellName, const QString& extention, int measurementId, const QDir& dir ) -> QString
{
QString candidate = dir.absoluteFilePath( QString( "%1_%2.obs" ).arg( wellName ).arg( measurementId ) );
QString candidate = dir.absoluteFilePath( QString( "%1_%2.%3" ).arg( wellName ).arg( measurementId ).arg( extention ) );
if ( QFile::exists( candidate ) )
{
return candidate;
}
QString candidateOldFormat = dir.absoluteFilePath( QString( "%1.obs" ).arg( wellName ) );
QString candidateOldFormat = dir.absoluteFilePath( QString( "%1.%2" ).arg( wellName ).arg( extention ) );
if ( QFile::exists( candidateOldFormat ) )
{
return candidateOldFormat;
@@ -263,7 +259,13 @@ void RifReaderFmuRft::importData()
return {};
};
QString observationFileName = findObservationFileName( wellName, measurementId, dir );
// 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 ) );
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;
for ( const auto& wellDate : wellDates )

5
ApplicationLibCode/UnitTests/RifReaderFmuRft-Test.cpp
View File

@@ -65,7 +65,10 @@ TEST( RifReaderFmuRftTest, LoadFile )
std::vector<double> values;
reader.values( adr, &values );
// Two measurements per date
if ( adr.wellName() == "R_A2" ) EXPECT_EQ( 2u, values.size() );
// One date with 6 measurements
if ( adr.wellName() == "R_A6" ) EXPECT_EQ( 6u, values.size() );
if ( adr.wellName() == "R_A2" ) EXPECT_EQ( 4u, values.size() );
}
}