OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-20 21:43:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Streamlines : Avoid load of a single step

Browse Source 
If only one time step is loaded, all other logic must be able to handle this situation. Load data for all time steps when asking for flow related data
Use absolute value when comparing flow values
This commit is contained in:
Magne Sjaastad 2021-02-26 10:16:50 +01:00
parent 9bd0a9ebac
commit 4a9e759e4b
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineDataAccess.cpp
View File

@ -97,8 +97,9 @@ cvf::ref<RigResultAccessor> RimStreamlineDataAccess::getDataAccessor( cvf::Struc
RigEclipseResultAddress address( RiaDefines::ResultCatType::DYNAMIC_NATIVE, resultname );
// Make sure we have the data we need loaded for the given phase and time step index
data->ensureKnownResultLoadedForTimeStep( address, timeIdx );
// Make sure we have the data loaded.
// NB, will trigger load of data for all time steps
data->ensureKnownResultLoaded( address );
return RigResultAccessorFactory::createFromResultAddress( m_data, gridIdx, porModel, timeIdx, address );
}

2
ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineGenerator2.cpp
View File

@ -55,7 +55,7 @@ void RimStreamlineGenerator2::generateTracer( RigCell cell,
for ( auto faceIdx : m_allFaces )
{
double flowVelocity = m_dataAccess->combinedFaceValueByArea( cell, faceIdx, m_phases, dominantPhase ) * direction;
if ( flowVelocity > m_flowThreshold )
if ( std::abs( flowVelocity ) > m_flowThreshold )
{
m_seeds.push_back( std::make_pair( cellIdx, faceIdx ) );
}

15
ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@ -1237,13 +1237,16 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu
if ( resVarAddr.isDivideByCellFaceAreaActive() )
{
if ( !RigCaseCellResultCalculator::computeDivideByCellFaceArea( m_ownerMainGrid,
this->m_ownerCaseData,
m_porosityModel,
resVarAddr ) )
if ( !isDataPresent( scalarResultIndex ) )
{
return cvf::UNDEFINED_SIZE_T;
if ( !RigCaseCellResultCalculator::computeDivideByCellFaceArea( m_ownerMainGrid,
this->m_ownerCaseData,
m_porosityModel,
resVarAddr ) )
{
return cvf::UNDEFINED_SIZE_T;
}
}
return scalarResultIndex;