OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 06:38:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#14319 Guard against malformed statistics cache files when restoring contour map results

Browse Source
This commit is contained in:
Magne Sjaastad committed 2026-08-13 07:22:30 +02:00
1 parent 0049d6ee72
commit 3371141a60
1 file changed
+15 -3
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp
+15 -3
View File
@@ -1052,8 +1052,19 @@ bool RimStatisticsContourMap::loadCachedResults()
{
const StatisticsType statisticsType = caf::AppEnum<StatisticsType>::fromIndex( statisticsTypeIndex );
const QString fileName = cacheFileName( m_cacheFileBaseName(), statisticsType, timeStep );
auto surfaceData = RifSurfio::importSurfaceData( fileName.toStdString() );
const QString fileName = cacheFileName( m_cacheFileBaseName(), statisticsType, timeStep );
// The surface reader throws on malformed files, fall back to recomputation
std::expected<std::pair<RigRegularSurfaceData, std::vector<float>>, std::string> surfaceData;
try
{
surfaceData = RifSurfio::importSurfaceData( fileName.toStdString() );
}
catch ( ... )
{
surfaceData = std::unexpected( "Unexpected file content" );
}
if ( !surfaceData.has_value() )
{
RiaLogging::warning( std::format( "Failed to read ensemble contour map statistics cache, recomputing: {}", fileName ) );
@@ -1061,7 +1072,8 @@ bool RimStatisticsContourMap::loadCachedResults()
}
const auto& [regularSurface, values] = surfaceData.value();
if ( regularSurface.nx != static_cast<int>( mapSize.x() ) || regularSurface.ny != static_cast<int>( mapSize.y() ) )
if ( regularSurface.nx != static_cast<int>( mapSize.x() ) || regularSurface.ny != static_cast<int>( mapSize.y() ) ||
values.size() != static_cast<size_t>( mapSize.x() ) * static_cast<size_t>( mapSize.y() ) )
{
RiaLogging::warning(
std::format( "Ensemble contour map statistics cache does not match the sample grid, recomputing: {}", fileName ) );