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

Fix some signed/unsigned compare issues

Browse Source
This commit is contained in:
Magne Sjaastad
2022-11-10 07:17:58 +01:00
parent 3a99c039be
commit 4fea00afbf
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationLibCode/FileInterface/RifThermalFractureReader.cpp
View File

@@ -177,6 +177,7 @@ QDateTime RifThermalFractureReader::parseDateTime( const QString& dateString )
{
QString dateFormat = "dd.MM.yyyy hh:mm:ss";
QDateTime dateTime = QDateTime::fromString( dateString, dateFormat );
// Sometimes the datetime field is missing time
if ( !dateTime.isValid() )
{
@@ -240,10 +241,8 @@ std::pair<QString, QString> RifThermalFractureReader::parseNameAndUnit( const QS
QString unit = match.captured( 2 );
return std::make_pair( name, unit );
}
else
{
return std::make_pair( "", "" );
}
return std::make_pair( "", "" );
}
//--------------------------------------------------------------------------------------------------
@@ -264,8 +263,8 @@ RiaDefines::EclipseUnitSystem
QString unit = res->second;
if ( unit == RiaDefines::getExpectedThermalFractureUnit( targetName, RiaDefines::EclipseUnitSystem::UNITS_METRIC ) )
return RiaDefines::EclipseUnitSystem::UNITS_METRIC;
else if ( unit ==
RiaDefines::getExpectedThermalFractureUnit( targetName, RiaDefines::EclipseUnitSystem::UNITS_FIELD ) )
if ( unit == RiaDefines::getExpectedThermalFractureUnit( targetName, RiaDefines::EclipseUnitSystem::UNITS_FIELD ) )
return RiaDefines::EclipseUnitSystem::UNITS_FIELD;
}