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

#1776 CVS data parser. Made parsing more generic. Handle error result columns

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-05-23 12:26:37 +02:00
parent 8f5c3436ce
commit 22c71b60dd
16 changed files with 78 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@@ -35,7 +35,9 @@ RifEclipseSummaryAddress::RifEclipseSummaryAddress(SummaryVarCategory category,
m_wellSegmentNumber(-1),
m_cellI(-1),
m_cellJ(-1),
m_cellK(-1)
m_cellK(-1),
m_aquiferNumber(-1),
m_isErrorResult(false)
{
std::tuple<int, int, int> ijkTuple;
std::pair<int, int> reg2regPair;
@@ -225,7 +227,7 @@ std::string RifEclipseSummaryAddress::uiText(RifEclipseSummaryAddress::SummaryId
case RifEclipseSummaryAddress::INPUT_LGR_NAME: return lgrName();
case RifEclipseSummaryAddress::INPUT_SEGMENT_NUMBER: return std::to_string(wellSegmentNumber());
case RifEclipseSummaryAddress::INPUT_AQUIFER_NUMBER: return std::to_string(aquiferNumber());
case RifEclipseSummaryAddress::INPUT_VECTOR_NAME: return quantityName();
case RifEclipseSummaryAddress::INPUT_VECTOR_NAME: return quantityName() + (m_isErrorResult ? " (err)" : "");
}
return "";
}
@@ -430,6 +432,7 @@ bool operator==(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAd
}
break;
}
if (first.isErrorResult() != second.isErrorResult()) return false;
return true;
}
@@ -515,6 +518,7 @@ bool operator<(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAdd
break;
}
if (first.isErrorResult() != second.isErrorResult()) return first.isErrorResult() < second.isErrorResult();
return false;
}