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

Improve robustness if no data for keyword

Browse Source
This commit is contained in:
Magne Sjaastad committed 2025-07-18 08:47:01 +02:00
1 parent e28ab15859
commit 7ae5cc40db
2 files changed
+28 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/FileInterface/RifOpmCommonSummary.cpp
+23 -20
View File
@@ -176,28 +176,16 @@ std::vector<time_t> RifOpmCommonEclipseSummary::timeSteps( const RifEclipseSumma
//--------------------------------------------------------------------------------------------------
std::pair<bool, std::vector<double>> RifOpmCommonEclipseSummary::values( const RifEclipseSummaryAddress& resultAddress ) const
{
std::string keyword;
auto it = m_summaryAddressToKeywordMap.find( resultAddress );
if ( it != m_summaryAddressToKeywordMap.end() )
{
keyword = it->second;
}
else
{
// For ensembles, the result address may not be in the map, so we try to convert it to a text address
keyword = resultAddress.toEclipseTextAddress();
}
std::string keyword = keywordForAddress( resultAddress );
if ( !keyword.empty() )
{
std::vector<double> values;
if ( m_enhancedReader )
if ( m_enhancedReader && m_enhancedReader->hasKey( keyword ) )
{
auto fileValues = m_enhancedReader->get( keyword );
values.insert( values.begin(), fileValues.begin(), fileValues.end() );
}
else if ( m_standardReader )
else if ( m_standardReader && m_standardReader->hasKey( keyword ) )
{
auto fileValues = m_standardReader->get( keyword );
values.insert( values.begin(), fileValues.begin(), fileValues.end() );
@@ -214,15 +202,15 @@ std::pair<bool, std::vector<double>> RifOpmCommonEclipseSummary::values( const R
std::string RifOpmCommonEclipseSummary::unitName( const RifEclipseSummaryAddress& resultAddress ) const
{
std::string nameString;
auto it = m_summaryAddressToKeywordMap.find( resultAddress );
if ( it != m_summaryAddressToKeywordMap.end() )
std::string keyword = keywordForAddress( resultAddress );
if ( !keyword.empty() )
{
auto keyword = it->second;
if ( m_enhancedReader )
if ( m_enhancedReader && m_enhancedReader->hasKey( keyword ) )
{
nameString = m_enhancedReader->get_unit( keyword );
}
else if ( m_standardReader )
else if ( m_standardReader && m_standardReader->hasKey( keyword ) )
{
nameString = m_standardReader->get_unit( keyword );
}
@@ -390,6 +378,21 @@ void RifOpmCommonEclipseSummary::populateTimeSteps()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RifOpmCommonEclipseSummary::keywordForAddress( const RifEclipseSummaryAddress& address ) const
{
auto it = m_summaryAddressToKeywordMap.find( address );
if ( it != m_summaryAddressToKeywordMap.end() )
{
return it->second;
}
// For ensembles, the address may not be in the map, so we try to convert it to a text address
return address.toEclipseTextAddress();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/FileInterface/RifOpmCommonSummary.h
+5 -4
View File
@@ -80,10 +80,11 @@ public:
RiaDefines::EclipseUnitSystem unitSystem() const override;
private:
size_t keywordCount() const override;
void createAndSetAddresses() override;
bool openFileReader( const QString& fileName, bool includeRestartFiles, RiaThreadSafeLogger* threadSafeLogger );
void populateTimeSteps();
size_t keywordCount() const override;
void createAndSetAddresses() override;
bool openFileReader( const QString& fileName, bool includeRestartFiles, RiaThreadSafeLogger* threadSafeLogger );
void populateTimeSteps();
std::string keywordForAddress( const RifEclipseSummaryAddress& address ) const;
static void increaseEsmryFileCount();
static QString enhancedSummaryFilename( const QString& fileName );