From e08cd0c46c1ac18bb849fca2ea3a96edce35ec19 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Mon, 2 Nov 2020 21:45:06 +0100 Subject: [PATCH] #6834 Use time step from fracture model when extracting curve. --- .../ProjectDataModel/RimFractureModelCurve.cpp | 9 ++++++--- .../ProjectDataModel/RimFractureModelPlot.cpp | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimFractureModelCurve.cpp b/ApplicationCode/ProjectDataModel/RimFractureModelCurve.cpp index 130afca4b0..5124e8f6f7 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureModelCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureModelCurve.cpp @@ -70,6 +70,8 @@ RimFractureModelCurve::~RimFractureModelCurve() void RimFractureModelCurve::setFractureModel( RimFractureModel* fractureModel ) { m_fractureModel = fractureModel; + m_case = fractureModel->eclipseCase(); + m_timeStep = fractureModel->timeStep(); m_wellPath = fractureModel->thicknessDirectionWellPath(); } @@ -129,11 +131,12 @@ void RimFractureModelCurve::performDataExtraction( bool* isUsingPseudoLength ) *isUsingPseudoLength = false; - RimEclipseCase* eclipseCase = dynamic_cast( m_case.value() ); - if ( eclipseCase && m_fractureModel ) + if ( m_fractureModel && m_fractureModel->eclipseCase() ) { + RimEclipseCase* eclipseCase = m_fractureModel->eclipseCase(); + bool isOk = m_fractureModel->calculator()->extractCurveData( curveProperty(), - m_timeStep, + m_fractureModel->timeStep(), values, measuredDepthValues, tvDepthValues, diff --git a/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp b/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp index 004f127e48..8c588dfda9 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp @@ -67,7 +67,8 @@ void RimFractureModelPlot::setFractureModel( RimFractureModel* fractureModel ) m_fractureModel = fractureModel; m_eclipseCase = fractureModel->eclipseCase(); m_timeStep = fractureModel->timeStep(); - setName( fractureModel->name() ); + + m_nameConfig->setCustomName( fractureModel->name() ); } //--------------------------------------------------------------------------------------------------