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

#1959 : Improve detection of comment lines in header

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-03 08:07:18 +02:00
parent 5375da3fc8
commit 2fc1d20f45
2 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp
View File

@ -34,16 +34,25 @@
//--------------------------------------------------------------------------------------------------
bool RifEclipseUserDataParserTools::isLineSkippable(const std::string& line)
{
if (std::all_of(line.begin(), line.end(), isspace))
std::size_t found = line.find_first_not_of(" ");
if (found == std::string::npos)
{
// Line with only spaces
return true;
}
else if (line.size() > 1 && line[0] == '-' && line[1] == '-')
if (line[found] == '-')
{
// Comments start with -
return true;
}
else if (line.size() == 1 && line[0] == '1')
if (line[0] == '1')
{
// Single 1 at start of file
return true;
}

51
ApplicationCode/UnitTests/ObservedDataParser-Test.cpp
View File

@ -381,6 +381,57 @@ TEST(RifColumnBasedRsmspecParserTest, TestTableValues)
EXPECT_NE("P-9P", tables.at(1).at(0).summaryAddress.wellName());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RifColumnBasedRsmspecParserTest, TestTableValuesHeaderWithSpaces)
{
QString data;
QTextStream out(&data);
out << "1\n";
out << " -----------------------------------------\n";
out << " SUMMARY OF RUN NORNE_ATW2013_RFTPLT_V3 EC\n";
out << " -----------------------------------------\n";
out << " DATE YEARS WBHP \n";
out << " YEARS BARSA \n";
out << " B-1H \n";
out << " \n";
out << " -----------------------------------------\n";
out << " 6-NOV-1997 0 0 \n";
out << " 7-NOV-1997 0.002738 0 \n";
out << " 8-NOV-1997 0.006556 0 \n";
out << " 9-NOV-1997 0.009231 0 \n";
out << " 10-NOV-1997 0.011462 0 \n";
out << " 11-NOV-1997 0.013710 0 \n";
out << " 11-NOV-1997 0.015950 0 \n";
out << " 12-NOV-1997 0.018477 0 \n";
out << " 13-NOV-1997 0.020190 0 \n";
out << " 14-NOV-1997 0.021903 0 \n";
out << " 14-NOV-1997 0.024232 0 \n";
out << " 17-NOV-1997 0.030838 0 \n";
out << " 19-NOV-1997 0.037060 0 \n";
out << " 21-NOV-1997 0.042841 0 \n";
out << " 23-NOV-1997 0.049239 0 \n";
out << " 25-NOV-1997 0.054613 0 \n";
out << " 28-NOV-1997 0.061135 0 \n";
out << " 29-NOV-1997 0.064791 0 \n";
out << " 1-DEC-1997 0.068446 0 \n";
out << " 2-DEC-1997 0.073016 0 \n";
out << " 4-DEC-1997 0.078727 0 \n";
out << " 7-DEC-1997 0.085750 0 \n";
out << " 10-DEC-1997 0.093124 0 \n";
out << " 13-DEC-1997 0.101750 0 \n";
out << " 15-DEC-1997 0.107001 0 \n";
out << " 17-DEC-1997 0.112252 0 \n";
RifColumnBasedUserDataParser parser = RifColumnBasedUserDataParser(data);
std::vector< std::vector<ColumnInfo> > tables = parser.tables();
ASSERT_EQ(tables.size(), 1);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------