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

Revert "#4114 Regression Test : Remove cached pointer to eclipse case"

Browse Source 
This reverts commit f2146c6007.
This commit is contained in:
Magne Sjaastad 2019-02-20 11:35:31 +01:00
parent 90b189f490
commit 5449ef39dd
2 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -178,6 +178,8 @@ void RimEclipseResultDefinition::simpleCopy(const RimEclipseResultDefinition* ot
//--------------------------------------------------------------------------------------------------
void RimEclipseResultDefinition::setEclipseCase(RimEclipseCase* eclipseCase)
{
m_eclipseCase = eclipseCase;
assignFlowSolutionFromCase();
}
@ -186,9 +188,9 @@ void RimEclipseResultDefinition::setEclipseCase(RimEclipseCase* eclipseCase)
//--------------------------------------------------------------------------------------------------
RigCaseCellResultsData* RimEclipseResultDefinition::currentGridCellResults() const
{
if (!ownerEclipseCase()) return nullptr;
if (!m_eclipseCase) return nullptr;
return ownerEclipseCase()->results(m_porosityModel());
return m_eclipseCase->results(m_porosityModel());
}
//--------------------------------------------------------------------------------------------------
@ -497,7 +499,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
if (fieldNeedingOptions == &m_resultTypeUiField)
{
bool hasSourSimRLFile = false;
RimEclipseResultCase* eclResCase = dynamic_cast<RimEclipseResultCase*>(ownerEclipseCase());
RimEclipseResultCase* eclResCase = dynamic_cast<RimEclipseResultCase*>(m_eclipseCase.p());
if (eclResCase && eclResCase->eclipseCaseData())
{
hasSourSimRLFile = eclResCase->hasSourSimFile();
@ -512,9 +514,9 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
bool enableSouring = false;
#ifdef ENABLE_SOURING
if (ownerEclipseCase())
if (m_eclipseCase.notNull())
{
RigCaseCellResultsData* cellResultsData = ownerEclipseCase()->results(this->porosityModel());
RigCaseCellResultsData* cellResultsData = m_eclipseCase->results(this->porosityModel());
if (cellResultsData->hasFlowDiagUsableFluxes())
{
@ -569,7 +571,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
}
else if (fieldNeedingOptions == &m_flowSolutionUiField)
{
RimEclipseResultCase* eclCase = dynamic_cast<RimEclipseResultCase*>(ownerEclipseCase());
RimEclipseResultCase* eclCase = dynamic_cast<RimEclipseResultCase*>(m_eclipseCase.p());
if (eclCase)
{
std::vector<RimFlowDiagSolution*> flowSols = eclCase->flowDiagSolutions();
@ -902,11 +904,11 @@ void RimEclipseResultDefinition::loadResult()
if (isFlowDiagOrInjectionFlooding()) return; // Will load automatically on access
if (ownerEclipseCase())
if (m_eclipseCase)
{
if (!ownerEclipseCase()->ensureReservoirCaseIsOpen())
if (!m_eclipseCase->ensureReservoirCaseIsOpen())
{
RiaLogging::error("Could not open the Eclipse Grid file: " + ownerEclipseCase()->gridFileName());
RiaLogging::error("Could not open the Eclipse Grid file: " + m_eclipseCase->gridFileName());
return;
}
}
@ -915,7 +917,7 @@ void RimEclipseResultDefinition::loadResult()
{
if (!m_differenceCase->ensureReservoirCaseIsOpen())
{
RiaLogging::error("Could not open the Eclipse Grid file: " + m_differenceCase->gridFileName());
RiaLogging::error("Could not open the Eclipse Grid file: " + m_eclipseCase->gridFileName());
return;
}
}
@ -930,7 +932,6 @@ void RimEclipseResultDefinition::loadResult()
gridCellResults->ensureKnownResultLoaded(this->eclipseResultAddress());
}
}
//--------------------------------------------------------------------------------------------------
@ -1179,8 +1180,8 @@ bool RimEclipseResultDefinition::isCompletionTypeSelected() const
//--------------------------------------------------------------------------------------------------
bool RimEclipseResultDefinition::hasCategoryResult() const
{
if (this->m_resultType() == RiaDefines::FORMATION_NAMES && ownerEclipseCase() && ownerEclipseCase()->eclipseCaseData() &&
ownerEclipseCase()->eclipseCaseData()->activeFormationNames())
if (this->m_resultType() == RiaDefines::FORMATION_NAMES && m_eclipseCase && m_eclipseCase->eclipseCaseData() &&
m_eclipseCase->eclipseCaseData()->activeFormationNames())
return true;
if (this->m_resultType() == RiaDefines::DYNAMIC_NATIVE && this->resultVariable() == RiaDefines::completionTypeResultName())
@ -1350,7 +1351,7 @@ void RimEclipseResultDefinition::assignFlowSolutionFromCase()
{
RimFlowDiagSolution* defaultFlowDiagSolution = nullptr;
RimEclipseResultCase* eclCase = dynamic_cast<RimEclipseResultCase*>(ownerEclipseCase());
RimEclipseResultCase* eclCase = dynamic_cast<RimEclipseResultCase*>(m_eclipseCase.p());
if (eclCase)
{
@ -1359,25 +1360,14 @@ void RimEclipseResultDefinition::assignFlowSolutionFromCase()
this->setFlowSolution(defaultFlowDiagSolution);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseCase* RimEclipseResultDefinition::ownerEclipseCase() const
{
RimEclipseCase* eclipseCase = nullptr;
this->firstAncestorOrThisOfType(eclipseCase);
return eclipseCase;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseResultDefinition::hasDualPorFractureResult()
{
if (ownerEclipseCase() && ownerEclipseCase()->eclipseCaseData())
if (m_eclipseCase && m_eclipseCase->eclipseCaseData())
{
return ownerEclipseCase()->eclipseCaseData()->hasFractureResults();
return m_eclipseCase->eclipseCaseData()->hasFractureResults();
}
return false;

4
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -166,6 +166,9 @@ protected:
caf::PdmField<std::vector<QString> > m_selectedSouringTracersUiField;
caf::PdmPointer<RimEclipseCase> m_eclipseCase;
caf::PdmField<std::vector<QString> > m_selectedTracers_OBSOLETE;
private:
struct TracerComp
@ -175,7 +178,6 @@ private:
private:
void assignFlowSolutionFromCase();
RimEclipseCase* ownerEclipseCase() const;
bool hasDualPorFractureResult();