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: set isAVector correctly

Browse Source
This commit is contained in:
Rebecca Cox
2017-09-26 13:46:00 +02:00
parent b1e70c95b3
commit b8f18dd4c8
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifRsmspecParserTools.cpp
View File

@@ -345,6 +345,14 @@ std::vector<ColumnInfo> RifRsmspecParserTools::columnInfoForTable(std::stringstr
table[i].summaryAddress = makeAndFillAddress(quantityNames.at(i), restOfHeaderColumn); table[i].summaryAddress = makeAndFillAddress(quantityNames.at(i), restOfHeaderColumn);
} }
for (ColumnInfo& column : table)
{
if (column.summaryAddress.category() != RifEclipseSummaryAddress::SUMMARY_INVALID)
{
column.isAVector = true;
}
}
return table; return table;
} }

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

@@ -366,6 +366,9 @@ TEST(RifColumnBasedRsmspecParserTest, TestTableValues)
ASSERT_EQ(18, tables.at(0).at(0).values.size()); ASSERT_EQ(18, tables.at(0).at(0).values.size());
ASSERT_EQ(4, tables.at(1).at(0).values.size()); ASSERT_EQ(4, tables.at(1).at(0).values.size());
EXPECT_TRUE(tables.at(0).at(2).isAVector);
EXPECT_FALSE(tables.at(1).at(0).isAVector);
EXPECT_EQ(0.0, tables.at(0).at(1).values.at(6)); EXPECT_EQ(0.0, tables.at(0).at(1).values.at(6));
EXPECT_EQ(282, tables.at(0).at(3).values.at(6)); EXPECT_EQ(282, tables.at(0).at(3).values.at(6));