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

#7912 Summary Data Import : Review feedback

Browse Source
This commit is contained in:
Magne Sjaastad 2021-09-13 08:36:51 +02:00
parent f699f5f6b8
commit 41f80e7d89
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/Application/RiaPreferencesSummary.cpp
View File

@ -111,8 +111,8 @@ RiaPreferencesSummary::RiaPreferencesSummary()
"" ); "" );
CAF_PDM_InitField( &m_createEnhancedSummaryDataFile, CAF_PDM_InitField( &m_createEnhancedSummaryDataFile,
"createOptimizedSummaryDataFile", "createEnhancedSummaryDataFile",
false, true,
"Create ESMRY Summary Files", "Create ESMRY Summary Files",
"", "",
"If not present, create summary file with extension '*.ESMRY'", "If not present, create summary file with extension '*.ESMRY'",
@ -120,7 +120,7 @@ RiaPreferencesSummary::RiaPreferencesSummary()
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_createEnhancedSummaryDataFile ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_createEnhancedSummaryDataFile );
CAF_PDM_InitField( &m_useEnhancedSummaryDataFile, CAF_PDM_InitField( &m_useEnhancedSummaryDataFile,
"useOptimizedSummaryDataFile", "useEnhancedSummaryDataFile",
true, true,
"Use ESMRY Files", "Use ESMRY Files",
"", "",

7
ApplicationLibCode/FileInterface/RifOpmCommonSummary.cpp
View File

@ -140,8 +140,7 @@ bool RifOpmCommonEclipseSummary::values( const RifEclipseSummaryAddress& resultA
auto fileValues = m_enhancedReader->get( keyword ); auto fileValues = m_enhancedReader->get( keyword );
values->insert( values->begin(), fileValues.begin(), fileValues.end() ); values->insert( values->begin(), fileValues.begin(), fileValues.end() );
} }
else if ( m_standardReader )
if ( m_standardReader )
{ {
auto fileValues = m_standardReader->get( keyword ); auto fileValues = m_standardReader->get( keyword );
values->insert( values->begin(), fileValues.begin(), fileValues.end() ); values->insert( values->begin(), fileValues.begin(), fileValues.end() );
@ -165,6 +164,7 @@ std::string RifOpmCommonEclipseSummary::unitName( const RifEclipseSummaryAddress
{ {
return m_enhancedReader->get_unit( keyword ); return m_enhancedReader->get_unit( keyword );
} }
if ( m_standardReader ) if ( m_standardReader )
{ {
return m_standardReader->get_unit( keyword ); return m_standardReader->get_unit( keyword );
@ -196,8 +196,7 @@ void RifOpmCommonEclipseSummary::buildMetaData()
dates = m_enhancedReader->dates(); dates = m_enhancedReader->dates();
keywords = m_enhancedReader->keywordList(); keywords = m_enhancedReader->keywordList();
} }
else if ( m_standardReader )
if ( m_standardReader )
{ {
dates = m_standardReader->dates(); dates = m_standardReader->dates();
keywords = m_standardReader->keywordList(); keywords = m_standardReader->keywordList();

10
ApplicationLibCode/UnitTests/opm-summary-Test.cpp
View File

@ -11,7 +11,7 @@ static const QString H5_TEST_DATA_DIRECTORY = QString( "%1/h5-file/" ).arg( TEST
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
TEST( DISABLED_OpmSummaryTests, ReadOpmSummaryDataListContent ) TEST( OpmSummaryTests, ReadOpmSummaryDataListContent )
{ {
std::vector<std::string> esmryKeywords; std::vector<std::string> esmryKeywords;
{ {
@ -42,12 +42,4 @@ TEST( DISABLED_OpmSummaryTests, ReadOpmSummaryDataListContent )
RifEclipseSummaryAddress eclAdr = RifEclipseSummaryAddress::fromEclipseTextAddress( s1 ); RifEclipseSummaryAddress eclAdr = RifEclipseSummaryAddress::fromEclipseTextAddress( s1 );
EXPECT_TRUE( eclAdr.isValid() ); EXPECT_TRUE( eclAdr.isValid() );
} }
/*
auto keywords = eSmry.keywordList();
for ( auto k : keywords )
{
std::cout << k << "\n";
}
*/
} }