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

Summary observed data

Browse Source 
* #9966 Summary calculations: add support for imported vectors.
* #9966 Summary Calculation: add support for imported and observed data.
* Summary Address: avoid extra level in tree for imported data.
* #9966 Update observed data when calculation is updated.
This commit is contained in:
Kristian Bendiksen authored and GitHub committed 2023-03-15 13:39:57 +01:00
1 parent 26416c8937
commit 245d483036
11 files changed
+90 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp
+21 -1
View File
@@ -27,6 +27,8 @@
#include "RifSummaryReaderInterface.h"
#include "RimDataSourceSteppingTools.h"
#include "RimObservedDataCollection.h"
#include "RimObservedSummaryData.h"
#include "RimProject.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCalculationCollection.h"
@@ -267,7 +269,8 @@ void RimSummaryCalculation::substituteVariables( std::vector<SummaryCalculationV
newValue = QString::fromStdString( address.blockAsString() );
isHandledBySteppingTools = true;
}
else if ( category == RifEclipseSummaryAddress::SUMMARY_MISC || category == RifEclipseSummaryAddress::SUMMARY_FIELD )
else if ( category == RifEclipseSummaryAddress::SUMMARY_MISC || category == RifEclipseSummaryAddress::SUMMARY_FIELD ||
category == RifEclipseSummaryAddress::SUMMARY_IMPORTED )
{
// No need to do anything for these types
return;
@@ -412,6 +415,15 @@ void RimSummaryCalculation::updateDependentObjects()
summaryCase->refreshMetaData();
}
RimObservedDataCollection* observedDataCollection = RiaSummaryTools::observedDataCollection();
auto observedData = observedDataCollection->allObservedSummaryData();
for ( auto obs : observedData )
{
obs->createSummaryReaderInterface();
obs->createRftReaderInterface();
obs->refreshMetaData();
}
auto summaryCaseCollections = summaryCaseCollection->summaryCaseCollections();
for ( RimSummaryCaseCollection* summaryCaseCollection : summaryCaseCollections )
{
@@ -559,6 +571,10 @@ std::vector<RimSummaryCalculationAddress>
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::regionToRegionAddress( name, r1, r2, m_id ) ) );
}
}
else if ( category == RifEclipseSummaryAddress::SUMMARY_IMPORTED )
{
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::importedAddress( name, m_id ) ) );
}
return addresses;
}
@@ -603,6 +619,10 @@ RimSummaryCalculationAddress RimSummaryCalculation::singleAddressesForCategory(
{
return RifEclipseSummaryAddress::regionToRegionAddress( name, address.regionNumber(), address.regionNumber2(), m_id );
}
else if ( category == RifEclipseSummaryAddress::SUMMARY_IMPORTED )
{
return RifEclipseSummaryAddress::importedAddress( name, m_id );
}
return RifEclipseSummaryAddress();
}