#1428 Respect current timestep of well log extraction curves when getting flow diagnostics result address

This commit is contained in:
Bjørnar Grip Fjær
2017-04-26 16:59:52 +02:00
parent 700a73ca19
commit b91af15214
3 changed files with 24 additions and 0 deletions

View File

@@ -37,6 +37,8 @@
#include "RimReservoirCellResultsStorage.h"
#include "RimView.h"
#include "RimViewLinker.h"
#include "RimGridTimeHistoryCurve.h"
#include "RimWellLogExtractionCurve.h"
#include "cafPdmUiListEditor.h"
@@ -662,6 +664,18 @@ RigFlowDiagResultAddress RimEclipseResultDefinition::flowDiagResAddress() const
{
timeStep = rimView->currentTimeStep();
}
RimWellLogExtractionCurve* wellLogExtractionCurve = nullptr;
this->firstAncestorOrThisOfType(wellLogExtractionCurve);
if (wellLogExtractionCurve)
{
timeStep = static_cast<size_t>(wellLogExtractionCurve->currentTimeStep());
}
// Time history curves are not supported, since it requires the time
// step to access to be supplied.
RimGridTimeHistoryCurve* timeHistoryCurve = nullptr;
this->firstAncestorOrThisOfType(timeHistoryCurve);
CVF_ASSERT(timeHistoryCurve == nullptr);
std::set<std::string> selTracerNames;
if (m_flowTracerSelectionMode == FLOW_TR_BY_SELECTION)

View File

@@ -899,3 +899,11 @@ double RimWellLogExtractionCurve::rkbDiff() const
return HUGE_VAL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimWellLogExtractionCurve::currentTimeStep() const
{
return m_timeStep();
}

View File

@@ -63,6 +63,8 @@ public:
QString caseName() const;
double rkbDiff() const;
int currentTimeStep() const;
protected:
virtual QString createCurveAutoName();
virtual void onLoadDataAndUpdate();