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

#3100 Well Path Import : Make sure last line is imported if no newline at end of last line

Browse Source
This commit is contained in:
Magne Sjaastad
2018-06-28 12:58:34 +02:00
parent bc7dbad45d
commit a97f9b282a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/FileInterface/RifWellPathImporter.cpp
View File

@@ -198,18 +198,19 @@ void RifWellPathImporter::readAllAsciiWellData(const QString& filePath)
std::vector<RifWellPathImporter::WellData>& fileWellDataArray = m_fileNameToWellDataGroupMap[filePath];
std::ifstream stream(filePath.toLatin1().data());
double x(HUGE_VAL), y(HUGE_VAL), tvd(HUGE_VAL), md(HUGE_VAL);
bool hasReadWellPointInCurrentWell = false;
while (stream.good())
{
double x(HUGE_VAL), y(HUGE_VAL), tvd(HUGE_VAL), md(HUGE_VAL);
// First check if we can read a number
stream >> x;
if (stream.good()) // If we can, assume this line is a well point entry
{
stream >> y >> tvd >> md;
if (!stream.good())
if (!stream.eof() && !stream.good())
{
// -999 or otherwise to few numbers before some word
if (x != -999)
@@ -231,11 +232,6 @@ void RifWellPathImporter::readAllAsciiWellData(const QString& filePath)
fileWellDataArray.back().m_wellPathGeometry->m_wellPathPoints.push_back(wellPoint);
fileWellDataArray.back().m_wellPathGeometry->m_measuredDepths.push_back(md);
x = HUGE_VAL;
y = HUGE_VAL;
tvd = HUGE_VAL;
md = HUGE_VAL;
hasReadWellPointInCurrentWell = true;
}
}