OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-23 23:13:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1933 Observed data: change int to size_t and clean up

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-26 11:01:22 +02:00
parent c0f978f006
commit 745bed2573
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ApplicationCode/FileInterface/RifRsmspecParserTools.cpp
View File

@ -199,15 +199,15 @@ size_t RifRsmspecParserTools::findFirstNonEmptyEntryIndex(std::vector<std::strin
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RifRsmspecParserTools::makeAndFillAddress(std::string quantityName, std::vector< std::string > headerColumn)
{
int regionNumber = -1;
int regionNumber2 = -1;
std::string wellGroupName = "";
std::string wellName = "";
int wellSegmentNumber = -1;
std::string lgrName = "";
int cellI = -1;
int cellJ = -1;
int cellK = -1;
int regionNumber = -1;
int regionNumber2 = -1;
std::string wellGroupName = "";
std::string wellName = "";
int wellSegmentNumber = -1;
std::string lgrName = "";
int cellI = -1;
int cellJ = -1;
int cellK = -1;
RifEclipseSummaryAddress::SummaryVarCategory category = identifyCategory(quantityName);
@ -270,13 +270,17 @@ RifEclipseSummaryAddress RifRsmspecParserTools::makeAndFillAddress(std::string q
//--------------------------------------------------------------------------------------------------
std::vector<ColumnInfo> RifRsmspecParserTools::columnInfoForTable(std::stringstream& streamData, std::string& line)
{
size_t columnCount = 0;
std::vector<ColumnInfo> table;
std::string origin = "";
std::string dateFormat = "";
std::string startDate = "";
while (isLineSkippable(line))
{
if (!streamData.good()) return table;
std::getline(streamData, line);
}
@ -287,7 +291,7 @@ std::vector<ColumnInfo> RifRsmspecParserTools::columnInfoForTable(std::stringstr
std::vector<std::string> scaleFactors = splitLineAndRemoveComments(line);
std::vector<RifEclipseSummaryAddress::SummaryVarCategory> categories;
columnCount = quantityNames.size();
size_t columnCount = quantityNames.size();
for (std::string unit : unitNames)
{
@ -323,9 +327,13 @@ std::vector<ColumnInfo> RifRsmspecParserTools::columnInfoForTable(std::stringstr
header = false;
break;
}
else if (words.size() > columnCount)
{
continue;
}
else
{
int diff = columnCount - words.size();
size_t diff = columnCount - words.size();
if (diff == columnCount)
{