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

#5131 Update calculation curves when summary case is replaced.

Browse Source
This commit is contained in:
Kristian Bendiksen
2019-12-09 09:21:06 +01:00
parent 8e540efa37
commit 35df3cc9d3
22 changed files with 218 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp
View File

@@ -85,7 +85,8 @@ void RifCalculatedSummaryCurveReader::buildMetaData()
for ( RimSummaryCalculation* calc : m_calculationCollection->calculations() )
{
m_allResultAddresses.insert( RifEclipseSummaryAddress::calculatedAddress( calc->description().toStdString() ) );
m_allResultAddresses.insert(
RifEclipseSummaryAddress::calculatedAddress( calc->description().toStdString(), calc->id() ) );
}
}
@@ -97,11 +98,10 @@ RimSummaryCalculation*
{
if ( m_calculationCollection && resultAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED )
{
QString calculatedName = QString::fromStdString( resultAddress.quantityName() );
int id = resultAddress.id();
for ( RimSummaryCalculation* calc : m_calculationCollection->calculations() )
{
if ( calc->description() == calculatedName )
if ( calc->id() == id )
{
return calc;
}

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
View File

@@ -65,6 +65,7 @@ RimSummaryAddress::RimSummaryAddress()
CAF_PDM_InitFieldNoDefault( &m_cellK, "SummaryCellK", "K", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_aquiferNumber, "SummaryAquifer", "Aquifer", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_isErrorResult, "IsErrorResult", "Is Error Result", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_calculationId, "CalculationId", "Calculation Id", "", "", "" );
m_category = RifEclipseSummaryAddress::SUMMARY_INVALID;
m_regionNumber = -1;
@@ -75,6 +76,7 @@ RimSummaryAddress::RimSummaryAddress()
m_cellK = -1;
m_aquiferNumber = -1;
m_isErrorResult = false;
m_calculationId = -1;
}
//--------------------------------------------------------------------------------------------------
@@ -98,9 +100,10 @@ void RimSummaryAddress::setAddress( const RifEclipseSummaryAddress& addr )
m_aquiferNumber = addr.aquiferNumber();
m_isErrorResult = addr.isErrorResult();
m_cellI = addr.cellI();
m_cellJ = addr.cellJ();
m_cellK = addr.cellK();
m_cellI = addr.cellI();
m_cellJ = addr.cellJ();
m_cellK = addr.cellK();
m_calculationId = addr.id();
}
//--------------------------------------------------------------------------------------------------
@@ -120,5 +123,6 @@ RifEclipseSummaryAddress RimSummaryAddress::address()
m_cellJ(),
m_cellK(),
m_aquiferNumber,
m_isErrorResult );
m_isErrorResult,
m_calculationId );
}

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.h
View File

@@ -62,4 +62,5 @@ private:
caf::PdmField<int> m_cellK;
caf::PdmField<int> m_aquiferNumber;
caf::PdmField<bool> m_isErrorResult;
caf::PdmField<int> m_calculationId;
};