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

Improve robustness when parsing PFLOTRAN files

Browse Source 
The include statements can optionally have a / at the end of the line. Make sure the parsing handles this correctly.
This commit is contained in:
Magne Sjaastad
2024-09-06 16:39:43 +02:00
parent 7ba4329bb4
commit e9509f026a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -1065,6 +1065,7 @@ void RifEclipseInputFileTools::parsePflotranInputFile( const QString& fileName,
{
// Find all referenced grdecl files in a pflotran input file, in the GRID section, example
// The line can optionally contain a '/' at the end, which is ignored
/*
GRID
TYPE grdecl ../include/ccs_3df_kh.grdecl
@@ -1090,12 +1091,12 @@ void RifEclipseInputFileTools::parsePflotranInputFile( const QString& fileName,
if ( line.startsWith( "TYPE" ) )
{
auto words = RiaTextStringTools::splitSkipEmptyParts( line, " " );
if ( words.size() == 3 && words[1].startsWith( "grdecl", Qt::CaseInsensitive ) )
if ( words.size() > 2 && words[1].startsWith( "grdecl", Qt::CaseInsensitive ) )
{
QFileInfo fi( fileName );
QDir currentFileFolder = fi.absoluteDir();
QString absoluteFilePath = currentFileFolder.absoluteFilePath( words.back() );
QString absoluteFilePath = currentFileFolder.absoluteFilePath( words[2] );
gridSectionFilenames.push_back( absoluteFilePath );
}
}
@@ -1113,6 +1114,7 @@ void RifEclipseInputFileTools::parsePflotranInputFile( const QString& fileName,
// Find all grdecl files defined by the external_file keyword
// For all these files, search for the FAULTS keyword and create fault objects
// The line can optionally contain a '/' at the end, which is ignored
/*
external_file ccs_3df_kh.grdecl
external_file ccs_3df_other.grdecl
@@ -1131,12 +1133,12 @@ void RifEclipseInputFileTools::parsePflotranInputFile( const QString& fileName,
if ( line.startsWith( "external_file", Qt::CaseInsensitive ) )
{
auto words = RiaTextStringTools::splitSkipEmptyParts( line, " " );
if ( words.size() == 2 )
if ( words.size() > 1 )
{
QFileInfo fi( gridSectionFilename );
QDir currentFileFolder = fi.absoluteDir();
QString absoluteFilePath = currentFileFolder.absoluteFilePath( words.back() );
QString absoluteFilePath = currentFileFolder.absoluteFilePath( words[1] );
QFile grdeclFilename( absoluteFilePath );
if ( !grdeclFilename.open( QFile::ReadOnly ) ) continue;

2
ApplicationLibCode/UnitTests/TestData/RifEclipseInputFileTools/pflotran/include/ccs_3df_kh.grdecl
View File

@@ -5,7 +5,7 @@ external_file ccs_3df_geom_kh.grdecl
external_file ccs_3df_prop.grdecl
external_file Faults_test_KH.grdecl
external_file Faults_test_KH.grdecl /
external_file multflt_test_KH.grdecl