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 type conversion issues

Browse Source
This commit is contained in:
Magne Sjaastad 2022-12-22 07:30:01 +01:00 committed by Kristian Bendiksen
parent 142d8f0cc6
commit 4b70572a04
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationLibCode/FileInterface/RifRoffFileTools.cpp
View File

@ -99,9 +99,9 @@ bool RifRoffFileTools::openGridFile( const QString& fileName, RigEclipseCaseData
std::vector<std::pair<std::string, RoffScalar>> values = reader.scalarNamedValues(); std::vector<std::pair<std::string, RoffScalar>> values = reader.scalarNamedValues();
std::vector<std::pair<std::string, Token::Kind>> arrayTypes = reader.getNamedArrayTypes(); std::vector<std::pair<std::string, Token::Kind>> arrayTypes = reader.getNamedArrayTypes();
size_t nx = getInt( values, "dimensions.nX" ); int nx = getInt( values, "dimensions.nX" );
size_t ny = getInt( values, "dimensions.nY" ); int ny = getInt( values, "dimensions.nY" );
size_t nz = getInt( values, "dimensions.nZ" ); int nz = getInt( values, "dimensions.nZ" );
RiaLogging::info( QString( "Grid dimensions: %1 %2 %3" ).arg( nx ).arg( ny ).arg( nz ) ); RiaLogging::info( QString( "Grid dimensions: %1 %2 %3" ).arg( nx ).arg( ny ).arg( nz ) );
float xOffset = getFloat( values, "translate.xoffset" ); float xOffset = getFloat( values, "translate.xoffset" );
@ -571,7 +571,7 @@ void RifRoffFileTools::convertToReservoirIndexOrder( int nx, int ny, int nz, con
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RifRoffFileTools::computeActiveCellMatrixIndex( std::vector<int>& activeCells ) size_t RifRoffFileTools::computeActiveCellMatrixIndex( std::vector<int>& activeCells )
{ {
size_t activeMatrixIndex = 0; int activeMatrixIndex = 0;
int cellCount = static_cast<int>( activeCells.size() ); int cellCount = static_cast<int>( activeCells.size() );
for ( int gridLocalCellIndex = 0; gridLocalCellIndex < cellCount; gridLocalCellIndex++ ) for ( int gridLocalCellIndex = 0; gridLocalCellIndex < cellCount; gridLocalCellIndex++ )
{ {
@ -697,9 +697,9 @@ bool RifRoffFileTools::appendNewInputPropertyResult( RigEclipseCaseData* caseDat
{ {
CVF_ASSERT( caseData ); CVF_ASSERT( caseData );
int nx = caseData->mainGrid()->cellCountI(); int nx = static_cast<int>( caseData->mainGrid()->cellCountI() );
int ny = caseData->mainGrid()->cellCountJ(); int ny = static_cast<int>( caseData->mainGrid()->cellCountJ() );
int nz = caseData->mainGrid()->cellCountK(); int nz = static_cast<int>( caseData->mainGrid()->cellCountK() );
std::vector<double> values = readAndConvertToDouble( nx, ny, nz, keyword, kind, reader ); std::vector<double> values = readAndConvertToDouble( nx, ny, nz, keyword, kind, reader );
if ( values.size() != caseData->mainGrid()->cellCount() ) return false; if ( values.size() != caseData->mainGrid()->cellCount() ) return false;