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

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
2023-03-15 13:39:57 +01:00
committed by GitHub
parent 26416c8937
commit 245d483036
11 changed files with 90 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationLibCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp
View File

@@ -24,8 +24,13 @@
#include "RifColumnBasedUserDataParser.h"
#include "RifKeywordVectorParser.h"
#include "RifKeywordVectorUserData.h"
#include "RifMultipleSummaryReaders.h"
#include "RifSummaryReaderInterface.h"
#include "RimCalculatedSummaryCurveReader.h"
#include "RimProject.h"
#include "RimSummaryCalculationCollection.h"
#include "cafUtils.h"
#include <QFile>
@@ -53,7 +58,8 @@ RimObservedEclipseUserData::~RimObservedEclipseUserData()
//--------------------------------------------------------------------------------------------------
void RimObservedEclipseUserData::createSummaryReaderInterface()
{
m_summeryReader = nullptr;
m_multiSummaryReader = nullptr;
m_summaryReader = nullptr;
if ( caf::Utils::fileExists( this->summaryHeaderFilename() ) )
{
@@ -74,7 +80,7 @@ void RimObservedEclipseUserData::createSummaryReaderInterface()
RifKeywordVectorUserData* keywordVectorUserData = new RifKeywordVectorUserData();
if ( keywordVectorUserData->parse( fileContents, customWellName() ) )
{
m_summeryReader = keywordVectorUserData;
m_summaryReader = keywordVectorUserData;
}
}
else
@@ -82,13 +88,20 @@ void RimObservedEclipseUserData::createSummaryReaderInterface()
RifColumnBasedUserData* columnBaseUserData = new RifColumnBasedUserData();
if ( columnBaseUserData->parse( fileContents, &m_errorText ) )
{
m_summeryReader = columnBaseUserData;
m_summaryReader = columnBaseUserData;
}
}
}
else
{
m_summeryReader = nullptr;
if ( m_summaryReader.notNull() )
{
m_multiSummaryReader = new RifMultipleSummaryReaders;
m_multiSummaryReader->addReader( m_summaryReader.p() );
RimSummaryCalculationCollection* calcColl = RimProject::current()->calculationCollection();
m_calculatedSummaryReader = new RifCalculatedSummaryCurveReader( calcColl, this );
m_multiSummaryReader->addReader( m_calculatedSummaryReader.p() );
}
}
}
@@ -97,11 +110,11 @@ void RimObservedEclipseUserData::createSummaryReaderInterface()
//--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface* RimObservedEclipseUserData::summaryReader()
{
if ( m_summeryReader.isNull() )
if ( m_multiSummaryReader.isNull() )
{
createSummaryReaderInterface();
}
return m_summeryReader.p();
return m_multiSummaryReader.p();
}
//--------------------------------------------------------------------------------------------------