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

#4993 Fix import property from text file when LGR is present

Browse Source
This commit is contained in:
Magne Sjaastad 2019-11-06 09:39:27 +01:00
parent 791de201b3
commit 309e4f9f31
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@ -306,7 +306,7 @@ bool RifEclipseInputFileTools::exportGrid( const QString& fileName,
cvf::Vec2f origin( mapAxes[2] - minPoint2f.x(), mapAxes[3] - minPoint2f.y() ); cvf::Vec2f origin( mapAxes[2] - minPoint2f.x(), mapAxes[3] - minPoint2f.y() );
cvf::Vec2f xPoint = cvf::Vec2f( mapAxes[4], mapAxes[5] ) - minPoint2f; cvf::Vec2f xPoint = cvf::Vec2f( mapAxes[4], mapAxes[5] ) - minPoint2f;
cvf::Vec2f yPoint = cvf::Vec2f( mapAxes[0], mapAxes[1] ) - minPoint2f; cvf::Vec2f yPoint = cvf::Vec2f( mapAxes[0], mapAxes[1] ) - minPoint2f;
mapAxes = {yPoint.x(), yPoint.y(), origin.x(), origin.y(), xPoint.x(), xPoint.y()}; mapAxes = { yPoint.x(), yPoint.y(), origin.x(), origin.y(), xPoint.x(), xPoint.y() };
mapAxisTrans.setTranslation( mapAxisTrans.translation() - minPoint3d ); mapAxisTrans.setTranslation( mapAxisTrans.translation() - minPoint3d );
} }
@ -875,25 +875,31 @@ bool RifEclipseInputFileTools::readDataFromKeyword( ecl_kw_type* eclipseK
CVF_ASSERT( eclipseKeywordData ); CVF_ASSERT( eclipseKeywordData );
CVF_ASSERT( errMsg ); CVF_ASSERT( errMsg );
bool mathingItemCount = false; // Number of values to allocate in the result data structure. Must either be number of active cells or
size_t keywordItemCount = 0u; // number of total cells in case to match the criteria in RigCaseCellResultsData::isUsingGlobalActiveIndex
size_t scalarValueCount = 0u;
{ {
keywordItemCount = static_cast<size_t>( ecl_kw_get_size( eclipseKeywordData ) ); bool mathingItemCount = false;
size_t keywordItemCount = static_cast<size_t>( ecl_kw_get_size( eclipseKeywordData ) );
if ( keywordItemCount == caseData->mainGrid()->cellCount() ) if ( keywordItemCount == caseData->mainGrid()->cellCount() )
{ {
mathingItemCount = true; mathingItemCount = true;
scalarValueCount = caseData->mainGrid()->globalCellArray().size();
} }
if ( keywordItemCount == caseData->activeCellInfo( RiaDefines::MATRIX_MODEL )->reservoirActiveCellCount() ) else if ( keywordItemCount == caseData->activeCellInfo( RiaDefines::MATRIX_MODEL )->reservoirActiveCellCount() )
{ {
mathingItemCount = true; mathingItemCount = true;
scalarValueCount = caseData->activeCellInfo( RiaDefines::MATRIX_MODEL )->reservoirActiveCellCount();
} }
}
if ( !mathingItemCount ) if ( !mathingItemCount )
{ {
QString errFormat( "Size mismatch: Main Grid has %1 cells, keyword %2 has %3 cells" ); QString errFormat( "Size mismatch: Main Grid has %1 cells, keyword %2 has %3 cells" );
*errMsg = errFormat.arg( caseData->mainGrid()->cellCount() ).arg( resultName ).arg( keywordItemCount ); *errMsg = errFormat.arg( caseData->mainGrid()->cellCount() ).arg( resultName ).arg( keywordItemCount );
return false; return false;
}
} }
RigEclipseResultAddress resAddr( RiaDefines::INPUT_PROPERTY, resultName ); RigEclipseResultAddress resAddr( RiaDefines::INPUT_PROPERTY, resultName );
@ -902,7 +908,7 @@ bool RifEclipseInputFileTools::readDataFromKeyword( ecl_kw_type* eclipseK
auto newPropertyData = caseData->results( RiaDefines::MATRIX_MODEL )->modifiableCellScalarResultTimesteps( resAddr ); auto newPropertyData = caseData->results( RiaDefines::MATRIX_MODEL )->modifiableCellScalarResultTimesteps( resAddr );
newPropertyData->push_back( std::vector<double>() ); newPropertyData->push_back( std::vector<double>() );
newPropertyData->at( 0 ).resize( ecl_kw_get_size( eclipseKeywordData ), HUGE_VAL ); newPropertyData->at( 0 ).resize( scalarValueCount, HUGE_VAL );
ecl_kw_get_data_as_double( eclipseKeywordData, newPropertyData->at( 0 ).data() ); ecl_kw_get_data_as_double( eclipseKeywordData, newPropertyData->at( 0 ).data() );