mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#1428 Respect current timestep of well log extraction curves when getting flow diagnostics result address
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -899,3 +899,11 @@ double RimWellLogExtractionCurve::rkbDiff() const
|
||||
|
||||
return HUGE_VAL;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
int RimWellLogExtractionCurve::currentTimeStep() const
|
||||
{
|
||||
return m_timeStep();
|
||||
}
|
||||
|
||||
@@ -63,6 +63,8 @@ public:
|
||||
QString caseName() const;
|
||||
double rkbDiff() const;
|
||||
|
||||
int currentTimeStep() const;
|
||||
|
||||
protected:
|
||||
virtual QString createCurveAutoName();
|
||||
virtual void onLoadDataAndUpdate();
|
||||
|
||||
Reference in New Issue
Block a user