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

#1933 Observed data: Handle lack of unit name in file

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-26 13:31:05 +02:00
parent 93971e541c
commit 2dda47014c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/FileInterface/RifRsmspecParserTools.cpp
View File

@ -270,6 +270,12 @@ std::vector<ColumnInfo> RifRsmspecParserTools::columnInfoForTable(std::stringstr
std::vector<RifEclipseSummaryAddress::SummaryVarCategory> categories;
size_t columnCount = quantityNames.size();
if (unitNames.size() != columnCount)
{
size_t diff = columnCount - unitNames.size();
unitNames.insert(unitNames.end(), diff, "");
}
for (std::string unit : unitNames)
{
ColumnInfo columnInfo;

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

@ -246,7 +246,7 @@ TEST(RifRsmspecParserToolsTest, TestSplitLineToDoubles)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RifColumnBasedRsmspecParserTest, TestKeywords)
TEST(RifColumnBasedRsmspecParserTest, TestKeywordsAndMissingUnitName)
{
QString data;
@ -258,7 +258,7 @@ TEST(RifColumnBasedRsmspecParserTest, TestKeywords)
out << "DATEFORMAT DD/MM/YY\n";
out << "\n";
out << "TIME YEARX WGT1 WGT2 WGT4 WR12 WR22 WR42 \n";
out << "DAYS YEARS kg/Sm3 kg/Sm3 kg/Sm3 kg/Sm3 kg/Sm3 kg/Sm3 \n";
out << "DAYS YEARS kg/Sm3 kg/Sm3 kg/Sm3 kg/Sm3 kg/Sm3 \n";
out << "1 1 1.00E+03 1.00E+03 1.00E+03 1.00E+03 1.00E+03 1.00E+03 \n";
out << " OP-1 OP-1 OP-1 OP-1 OP-1 OP-1 \n";
out << "\n";
@ -299,6 +299,8 @@ TEST(RifColumnBasedRsmspecParserTest, TestKeywords)
EXPECT_EQ("OP-2_TR", tables[1].at(0).origin);
EXPECT_EQ("DD/MM/YY", tables[1].at(0).dateFormat);
EXPECT_EQ("", tables[0].at(7).unitName);
ASSERT_EQ(8, tables.at(0).size());
EXPECT_EQ(1.0E-12, tables.at(0).at(4).values[0]);
}