OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-16 02:12:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

#8143 Review feedback

Browse Source
This commit is contained in:
Magne Sjaastad committed 2021-10-14 07:26:13 +02:00
1 parent 04b19e3ad7
commit 6bfdcebf0b
4 files changed
+73 -71
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/FileInterface/RifEclipseTextFileReader.cpp
+10 -11
View File
@@ -106,8 +106,8 @@ std::pair<std::string, std::vector<float>>
if ( isFaultKeyword )
{
// Read data until the FAULTS section is closed with a single / on one line
const auto& trimmed = ltrim( line );
if ( !trimmed.empty() && trimmed[0] == '/' )
ltrim( line );
if ( !line.empty() && line[0] == '/' )
{
return std::make_pair( keywordName, values );
}
@@ -119,10 +119,10 @@ std::pair<std::string, std::vector<float>>
if ( keywordName.empty() )
{
std::string candidate = trim( line );
if ( !candidate.empty() )
trim( line );
if ( !line.empty() )
{
keywordName = candidate;
keywordName = line;
if ( keywordName == "FAULTS" ) isFaultKeyword = true;
}
continue;
@@ -225,25 +225,24 @@ std::string_view RifEclipseTextFileReader::readLine( const std::string_view& sou
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string& RifEclipseTextFileReader::rtrim( std::string& s, const char* t /*= ws */ )
void RifEclipseTextFileReader::rtrim( std::string& s, const char* t /*= ws */ )
{
s.erase( s.find_last_not_of( t ) + 1 );
return s;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string& RifEclipseTextFileReader::ltrim( std::string& s, const char* t /*= ws */ )
void RifEclipseTextFileReader::ltrim( std::string& s, const char* t /*= ws */ )
{
s.erase( 0, s.find_first_not_of( t ) );
return s;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string& RifEclipseTextFileReader::trim( std::string& s, const char* t /*= ws */ )
void RifEclipseTextFileReader::trim( std::string& s, const char* t /*= ws */ )
{
return ltrim( rtrim( s, t ), t );
rtrim( s, t );
ltrim( s, t );
}