OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-04 12:40:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix comparison between signed and unsigned integer expressions.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-05-18 17:57:56 +02:00
parent 2f4ee076de
commit 30cec3e280
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -1946,7 +1946,8 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen
int frmIdx2 = it->first.second;
int combIndex = it->second;
if ( frmIdx1 >= fnVector.size() || frmIdx2 >= fnVector.size() ) continue;
int fnVectorSize = fnVector.size();
if ( frmIdx1 >= fnVectorSize || frmIdx2 >= fnVectorSize ) continue;
QString frmName1 = fnVector[frmIdx1];
QString frmName2 = fnVector[frmIdx2];

6
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
View File

@ -319,13 +319,13 @@ std::vector<RigGeoMechWellLogExtractor::WbsParameterSource>
double lasValue = getWellLogIntersectionValue( intersectionIdx, lasFileValues );
// Only accept las-values for PP_reservoir if the grid result is valid
bool validLasRegion = true;
if (isPPResResult)
if ( isPPResResult )
{
validLasRegion = intersectionIdx < gridValues.size() &&
validLasRegion = intersectionIdx < static_cast<int64_t>( gridValues.size() ) &&
gridValues[intersectionIdx] != std::numeric_limits<double>::infinity();
}
if ( validLasRegion && lasValue != std::numeric_limits<double>::infinity())
if ( validLasRegion && lasValue != std::numeric_limits<double>::infinity() )
{
unscaledValues[intersectionIdx] = lasValue;
finalSourcesPerSegment[intersectionIdx] = RigWbsParameter::LAS_FILE;

2
Fwk/VizFwk/LibGeometry/cvfBoundingBoxTree.cpp
View File

@ -488,7 +488,7 @@ bool AABBTree::buildTree()
{
bool bThreadRes = bRes;
#pragma omp for
for (int i = 0; i < m_previousLevelNodes.size(); ++i)
for (int i = 0; i < static_cast<int>(m_previousLevelNodes.size()); ++i)
{
bThreadRes = bThreadRes && buildTree(m_previousLevelNodes[i].node, m_previousLevelNodes[i].fromIdx, m_previousLevelNodes[i].toIdx, 4);
}