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

24
ApplicationLibCode/ProjectDataModel/Summary/RimCsvUserData.cpp
View File

@@ -23,7 +23,13 @@
#include "RifColumnBasedUserDataParser.h"
#include "RifCsvUserData.h"
#include "RifKeywordVectorUserData.h"
#include "RifMultipleSummaryReaders.h"
#include "RifSummaryReaderInterface.h"
#include "RifSummaryReaderMultipleFiles.h"
#include "RimCalculatedSummaryCurveReader.h"
#include "RimProject.h"
#include "RimSummaryCalculationCollection.h"
#include "cafUtils.h"
@@ -57,7 +63,7 @@ RimCsvUserData::~RimCsvUserData()
//--------------------------------------------------------------------------------------------------
void RimCsvUserData::createSummaryReaderInterface()
{
m_summaryReader = nullptr;
m_multiSummaryReader = nullptr;
if ( caf::Utils::fileExists( this->summaryHeaderFilename() ) )
{
@@ -65,12 +71,16 @@ void RimCsvUserData::createSummaryReaderInterface()
if ( csvUserData->parse( this->summaryHeaderFilename(), m_parseOptions->parseOptions(), &m_errorText ) )
{
m_summaryReader = csvUserData;
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() );
}
}
else
{
m_summaryReader = nullptr;
}
}
//--------------------------------------------------------------------------------------------------
@@ -78,11 +88,11 @@ void RimCsvUserData::createSummaryReaderInterface()
//--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface* RimCsvUserData::summaryReader()
{
if ( m_summaryReader.isNull() )
if ( m_multiSummaryReader.isNull() )
{
createSummaryReaderInterface();
}
return m_summaryReader.p();
return m_multiSummaryReader.p();
}
//--------------------------------------------------------------------------------------------------