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

Linux fixes

Browse Source 
p4#: 20691
This commit is contained in:
Magne Sjaastad
2013-03-02 10:18:27 +01:00
parent 27a8088421
commit 5ed0e5a725
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
View File

@@ -76,7 +76,7 @@ void RifEclipseRestartFilesetAccess::setFileSet(const QStringList& fileSet)
m_ecl_files.push_back(NULL); m_ecl_files.push_back(NULL);
} }
CVF_ASSERT(m_fileNames.size() == m_ecl_files.size()); CVF_ASSERT(m_fileNames.size() == static_cast<int>(m_ecl_files.size()));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

10
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -459,7 +459,7 @@ bool RifReaderEclipseOutput::readActiveCellInfo()
actnumValuesPerGrid.resize(actnumKeywordCount); actnumValuesPerGrid.resize(actnumKeywordCount);
size_t globalCellCount = 0; size_t globalCellCount = 0;
for (size_t gridIdx = 0; gridIdx < actnumKeywordCount; gridIdx++) for (size_t gridIdx = 0; gridIdx < static_cast<size_t>(actnumKeywordCount); gridIdx++)
{ {
RifEclipseOutputFileTools::keywordData(ecl_file, ACTNUM_KW, gridIdx, &actnumValuesPerGrid[gridIdx]); RifEclipseOutputFileTools::keywordData(ecl_file, ACTNUM_KW, gridIdx, &actnumValuesPerGrid[gridIdx]);
@@ -478,7 +478,7 @@ bool RifReaderEclipseOutput::readActiveCellInfo()
activeCellInfo->setGridCount(actnumKeywordCount); activeCellInfo->setGridCount(actnumKeywordCount);
size_t cellIdx = 0; size_t cellIdx = 0;
for (size_t gridIdx = 0; gridIdx < actnumKeywordCount; gridIdx++) for (size_t gridIdx = 0; gridIdx < static_cast<size_t>(actnumKeywordCount); gridIdx++)
{ {
size_t activeMatrixIndex = 0; size_t activeMatrixIndex = 0;
size_t activeFractureIndex = 0; size_t activeFractureIndex = 0;
@@ -810,7 +810,7 @@ void RifReaderEclipseOutput::readWellCells()
// If a well is defined in fracture region, the K-value is from (cellCountK - 1) -> cellCountK*2 - 1 // If a well is defined in fracture region, the K-value is from (cellCountK - 1) -> cellCountK*2 - 1
// Adjust K so index is always in valid grid region // Adjust K so index is always in valid grid region
if (cellK >= grids[gridNr]->cellCountK()) if (cellK >= static_cast<int>(grids[gridNr]->cellCountK()))
{ {
cellK -= static_cast<int>(grids[gridNr]->cellCountK()); cellK -= static_cast<int>(grids[gridNr]->cellCountK());
} }
@@ -855,7 +855,7 @@ void RifReaderEclipseOutput::readWellCells()
// If a well is defined in fracture region, the K-value is from (cellCountK - 1) -> cellCountK*2 - 1 // If a well is defined in fracture region, the K-value is from (cellCountK - 1) -> cellCountK*2 - 1
// Adjust K so index is always in valid grid region // Adjust K so index is always in valid grid region
if (cellK >= grids[gridNr]->cellCountK()) if (cellK >= static_cast<int>(grids[gridNr]->cellCountK()))
{ {
cellK -= static_cast<int>(grids[gridNr]->cellCountK()); cellK -= static_cast<int>(grids[gridNr]->cellCountK());
} }
@@ -893,7 +893,7 @@ QStringList RifReaderEclipseOutput::validKeywordsForPorosityModel(const QStringL
{ {
CVF_ASSERT(activeCellInfo); CVF_ASSERT(activeCellInfo);
if (keywords.size() != keywordDataItemCounts.size()) if (keywords.size() != static_cast<int>(keywordDataItemCounts.size()))
{ {
return QStringList(); return QStringList();
} }