Remove duplicated code.

Moving the data extraction out of the curves makes it possible to share
the curve drawing functionality.

ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp

@@ -20,7 +20,6 @@
 
 #include "RiaApplication.h"
 #include "RiaColorTables.h"
-#include "RiaFractureDefines.h"
 #include "RiaGuiApplication.h"
 #include "RiaLogging.h"
 
@@ -33,7 +32,6 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseResultDefinition.h"
 #include "RimEclipseView.h"
-#include "RimElasticPropertiesCurve.h"
 #include "RimFaciesProperties.h"
 #include "RimFractureModel.h"
 #include "RimFractureModelCurve.h"
@@ -114,13 +112,13 @@ RimFractureModelPlot* RicNewFractureModelPlotFeature::createPlot( RimFractureMod
 
     {
         auto task = progInfo.task( "Creating stress track", 2 );
-        createStressTrack( plot,
+        createParametersTrack( plot,
                                fractureModel,
                                eclipseCase,
                                timeStep,
                                "Stress",
                                {RiaDefines::CurveProperty::STRESS, RiaDefines::CurveProperty::INITIAL_STRESS} );
-        createStressTrack( plot,
+        createParametersTrack( plot,
                                fractureModel,
                                eclipseCase,
                                timeStep,
@@ -146,13 +144,14 @@ RimFractureModelPlot* RicNewFractureModelPlotFeature::createPlot( RimFractureMod
 
         for ( auto result : results )
         {
-            createElasticPropertiesTrack( plot, fractureModel, eclipseCase, timeStep, result );
+            QString trackName = caf::AppEnum<RiaDefines::CurveProperty>::uiText( result );
+            createParametersTrack( plot, fractureModel, eclipseCase, timeStep, trackName, {result} );
         }
     }
 
     {
         auto task = progInfo.task( "Creating temperature track", 2 );
-        createStressTrack( plot, fractureModel, eclipseCase, timeStep, "Temperature", {RiaDefines::CurveProperty::TEMPERATURE} );
+        createParametersTrack( plot, fractureModel, eclipseCase, timeStep, "Temperature", {RiaDefines::CurveProperty::TEMPERATURE} );
     }
 
     {
@@ -374,10 +373,14 @@ void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot
         curve->setLineStyle( RiuQwtPlotCurve::STYLE_SOLID );
         curve->setLineThickness( 2 );
 
+        if ( propertyType == RiaDefines::CurveProperty::STRESS_GRADIENT )
+        {
+            curve->setInterpolation( RiuQwtPlotCurve::INTERPOLATION_STEP_LEFT );
+        }
+
         if ( fixedInitialTimeStep )
         {
             curve->setAutoNameComponents( false, false, false, false, false );
-            curve->setCustomName( QString( "INITIAL %1" ).arg( resultVariable ) );
             curve->setCurrentTimeStep( 0 );
         }
         else
@@ -408,109 +411,6 @@ void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot
     RiuPlotMainWindowTools::showPlotMainWindow();
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RicNewFractureModelPlotFeature::createElasticPropertiesTrack( RimFractureModelPlot*     plot,
-                                                                   RimFractureModel*         fractureModel,
-                                                                   RimEclipseCase*           eclipseCase,
-                                                                   int                       timeStep,
-                                                                   RiaDefines::CurveProperty propertyType )
-{
-    QString          trackName = caf::AppEnum<RiaDefines::CurveProperty>::uiText( propertyType );
-    RimWellLogTrack* plotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, trackName, plot );
-    plotTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() );
-    plotTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR );
-    plotTrack->setLogarithmicScale( false );
-    plotTrack->setShowRegionLabels( true );
-    plotTrack->setShowWindow( true );
-    plotTrack->setColSpan( RimPlot::TWO );
-    plotTrack->setLegendsVisible( true );
-    plotTrack->setPlotTitleVisible( true );
-
-    caf::ColorTable colors = RiaColorTables::wellLogPlotPaletteColors();
-
-    RimElasticPropertiesCurve* curve = new RimElasticPropertiesCurve;
-    curve->setCurveProperty( propertyType );
-    curve->setFractureModel( fractureModel );
-    curve->setCase( eclipseCase );
-    curve->setColor( colors.cycledColor3f( 0 ) );
-    curve->setLineStyle( RiuQwtPlotCurve::STYLE_SOLID );
-    curve->setLineThickness( 2 );
-    curve->setUiName( trackName );
-    curve->setAutoNameComponents( false, false, false, false, false );
-
-    plotTrack->addCurve( curve );
-    plotTrack->setAutoScaleXEnabled( true );
-    curve->loadDataAndUpdate( true );
-
-    curve->updateConnectedEditors();
-    plotTrack->updateConnectedEditors();
-    plot->updateConnectedEditors();
-
-    RiaApplication::instance()->project()->updateConnectedEditors();
-
-    RiaGuiApplication::instance()->getOrCreateMainPlotWindow();
-    RiuPlotMainWindowTools::selectAsCurrentItem( curve );
-    RiuPlotMainWindowTools::showPlotMainWindow();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RicNewFractureModelPlotFeature::createStressTrack( RimFractureModelPlot*                         plot,
-                                                        RimFractureModel*                             fractureModel,
-                                                        RimEclipseCase*                               eclipseCase,
-                                                        int                                           timeStep,
-                                                        const QString&                                trackName,
-                                                        const std::vector<RiaDefines::CurveProperty>& propertyTypes )
-{
-    RimWellLogTrack* plotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack( false, trackName, plot );
-    plotTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR );
-    plotTrack->setLogarithmicScale( false );
-    plotTrack->setShowRegionLabels( true );
-    plotTrack->setShowWindow( true );
-    plotTrack->setColSpan( RimPlot::TWO );
-    plotTrack->setLegendsVisible( true );
-    plotTrack->setPlotTitleVisible( true );
-
-    caf::ColorTable colors     = RiaColorTables::wellLogPlotPaletteColors();
-    int             colorIndex = 0;
-
-    for ( const RiaDefines::CurveProperty& propertyType : propertyTypes )
-    {
-        RimFractureModelStressCurve* curve = new RimFractureModelStressCurve;
-        curve->setCurveProperty( propertyType );
-        curve->setFractureModel( fractureModel );
-        curve->setCase( eclipseCase );
-        curve->setColor( colors.cycledColor3f( colorIndex ) );
-        curve->setLineStyle( RiuQwtPlotCurve::STYLE_SOLID );
-        curve->setLineThickness( 2 );
-        curve->setUiName( trackName );
-        curve->setAutoNameComponents( false, false, false, false, false );
-        if ( propertyType == RiaDefines::CurveProperty::STRESS_GRADIENT )
-        {
-            curve->setInterpolation( RiuQwtPlotCurve::INTERPOLATION_STEP_LEFT );
-        }
-
-        plotTrack->addCurve( curve );
-        plotTrack->setAutoScaleXEnabled( true );
-        curve->loadDataAndUpdate( true );
-
-        curve->updateConnectedEditors();
-
-        colorIndex++;
-    }
-
-    plotTrack->updateConnectedEditors();
-    plot->updateConnectedEditors();
-
-    RiaApplication::instance()->project()->updateConnectedEditors();
-
-    RiaGuiApplication::instance()->getOrCreateMainPlotWindow();
-    RiuPlotMainWindowTools::showPlotMainWindow();
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.h

@@ -21,10 +21,7 @@
 #include "cafCmdFeature.h"
 
 #include "RiaDefines.h"
-
+#include "RiaFractureModelDefines.h"
-#include "RimElasticPropertiesCurve.h"
-#include "RimFractureModelCurve.h"
-#include "RimFractureModelStressCurve.h"
 
 class RimEclipseCase;
 class RimFractureModelPlot;
@@ -61,20 +58,7 @@ private:
                                        int                                           timeStep,
                                        const QString&                                trackTitle,
                                        const std::vector<RiaDefines::CurveProperty>& propertyTypes,
-                                       bool                                          isPlotLogarithmic );
+                                       bool                                          isPlotLogarithmic = false );
-
-    static void createElasticPropertiesTrack( RimFractureModelPlot*     plot,
-                                              RimFractureModel*         fractureModel,
-                                              RimEclipseCase*           eclipseCase,
-                                              int                       timeStep,
-                                              RiaDefines::CurveProperty propertyType );
-
-    static void createStressTrack( RimFractureModelPlot*                         plot,
-                                   RimFractureModel*                             fractureModel,
-                                   RimEclipseCase*                               eclipseCase,
-                                   int                                           timeStep,
-                                   const QString&                                trackName,
-                                   const std::vector<RiaDefines::CurveProperty>& propertyTypes );
 
     static RimFractureModelPlot* createFractureModelPlot( bool showAfterCreation, const QString& plotDescription );
 

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -164,9 +164,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimElasticProperties.h
 ${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertyScaling.h
 ${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertyScalingCollection.h
-${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertiesCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimLayerCurve.h
-${CMAKE_CURRENT_LIST_DIR}/RimFractureModelStressCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimAbstractPlotCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimFractureModelPropertyCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimFaciesProperties.h
@@ -345,9 +343,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCurve.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimElasticProperties.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertyScaling.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertyScalingCollection.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimElasticPropertiesCurve.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimLayerCurve.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimFractureModelStressCurve.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimFaciesProperties.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimNonNetLayers.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimFractureModelCalculator.cpp

ApplicationCode/ProjectDataModel/RimElasticPropertiesCurve.cpp

@@ -1,160 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2020-     Equinor ASA
-//
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-//
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#include "RimElasticPropertiesCurve.h"
-
-#include "RigEclipseCaseData.h"
-
-#include "RimEclipseCase.h"
-#include "RimEclipseResultDefinition.h"
-#include "RimFractureModel.h"
-#include "RimFractureModelCalculator.h"
-#include "RimModeledWellPath.h"
-
-#include "RiaFractureDefines.h"
-
-CAF_PDM_SOURCE_INIT( RimElasticPropertiesCurve, "ElasticPropertiesCurve" );
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RimElasticPropertiesCurve::RimElasticPropertiesCurve()
-{
-    CAF_PDM_InitObject( "Fracture Model Curve", "", "", "" );
-
-    CAF_PDM_InitFieldNoDefault( &m_fractureModel, "FractureModel", "Fracture Model", "", "", "" );
-    m_fractureModel.uiCapability()->setUiTreeChildrenHidden( true );
-    m_fractureModel.uiCapability()->setUiHidden( true );
-
-    CAF_PDM_InitFieldNoDefault( &m_curveProperty, "CurveProperty", "Curve Property", "", "", "" );
-    m_curveProperty.uiCapability()->setUiHidden( true );
-
-    m_wellPath = nullptr;
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RimElasticPropertiesCurve::~RimElasticPropertiesCurve()
-{
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimElasticPropertiesCurve::setFractureModel( RimFractureModel* fractureModel )
-{
-    m_fractureModel = fractureModel;
-    m_wellPath      = fractureModel->thicknessDirectionWellPath();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimElasticPropertiesCurve::setEclipseResultCategory( RiaDefines::ResultCatType catType )
-{
-    m_eclipseResultDefinition->setResultType( catType );
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimElasticPropertiesCurve::setCurveProperty( RiaDefines::CurveProperty curveProperty )
-{
-    m_curveProperty = curveProperty;
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RiaDefines::CurveProperty RimElasticPropertiesCurve::curveProperty() const
-{
-    return m_curveProperty();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimElasticPropertiesCurve::performDataExtraction( bool* isUsingPseudoLength )
-{
-    std::vector<double> values;
-    std::vector<double> measuredDepthValues;
-    std::vector<double> tvDepthValues;
-    double              rkbDiff = 0.0;
-
-    RiaDefines::DepthUnitType depthUnit = RiaDefines::DepthUnitType::UNIT_METER;
-    QString                   xUnits    = RiaWellLogUnitTools<double>::noUnitString();
-
-    *isUsingPseudoLength = false;
-
-    RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( m_case.value() );
-    if ( eclipseCase && m_fractureModel )
-    {
-        bool isOk = m_fractureModel->calculator()->extractCurveData( curveProperty(),
-                                                                     m_timeStep,
-                                                                     values,
-                                                                     measuredDepthValues,
-                                                                     tvDepthValues,
-                                                                     rkbDiff );
-        if ( !isOk )
-        {
-            return;
-        }
-
-        RiaEclipseUnitTools::UnitSystem eclipseUnitsType = eclipseCase->eclipseCaseData()->unitsType();
-        if ( eclipseUnitsType == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
-        {
-            // See https://github.com/OPM/ResInsight/issues/538
-
-            depthUnit = RiaDefines::DepthUnitType::UNIT_FEET;
-        }
-    }
-
-    bool performDataSmoothing = false;
-    if ( !values.empty() && !measuredDepthValues.empty() )
-    {
-        if ( tvDepthValues.empty() )
-        {
-            this->setValuesAndDepths( values,
-                                      measuredDepthValues,
-                                      RiaDefines::DepthTypeEnum::MEASURED_DEPTH,
-                                      0.0,
-                                      depthUnit,
-                                      !performDataSmoothing,
-                                      xUnits );
-        }
-        else
-        {
-            this->setValuesWithMdAndTVD( values,
-                                         measuredDepthValues,
-                                         tvDepthValues,
-                                         rkbDiff,
-                                         depthUnit,
-                                         !performDataSmoothing,
-                                         xUnits );
-        }
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-QString RimElasticPropertiesCurve::createCurveAutoName()
-{
-    return caf::AppEnum<RiaDefines::CurveProperty>::uiText( m_curveProperty() );
-}

ApplicationCode/ProjectDataModel/RimElasticPropertiesCurve.h

@@ -1,84 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2020-     Equinor ASA
-//
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-//
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "RimFractureModelPropertyCurve.h"
-#include "RimWellLogExtractionCurve.h"
-
-#include "RiuQwtSymbol.h"
-
-#include "cafPdmField.h"
-#include "cafPdmPtrField.h"
-
-#include <vector>
-
-class RimWellPath;
-class RimWellMeasurement;
-class RimFractureModel;
-class RimColorLegend;
-
-//==================================================================================================
-///
-//==================================================================================================
-class RimElasticPropertiesCurve : public RimWellLogExtractionCurve, public RimFractureModelPropertyCurve
-{
-    CAF_PDM_HEADER_INIT;
-
-public:
-    RimElasticPropertiesCurve();
-    ~RimElasticPropertiesCurve() override;
-
-    void setFractureModel( RimFractureModel* fractureModel );
-
-    void setEclipseResultCategory( RiaDefines::ResultCatType catType );
-
-    void                      setCurveProperty( RiaDefines::CurveProperty ) override;
-    RiaDefines::CurveProperty curveProperty() const override;
-
-protected:
-    QString createCurveAutoName() override;
-
-    void performDataExtraction( bool* isUsingPseudoLength ) override;
-
-    static QString findFaciesName( const RimColorLegend& colorLegend, double value );
-    static double  findFaciesValue( const RimColorLegend& colorLegend, const QString& name );
-
-    static void addOverburden( std::vector<QString>& formationNames,
-                               std::vector<double>&  formationValues,
-                               std::vector<double>&  faciesValues,
-                               std::vector<double>&  tvDepthValues,
-                               std::vector<double>&  measuredDepthValues,
-                               double                overburdenHeight,
-                               double                defaultPoroValue,
-                               const QString&        formationName,
-                               double                faciesValue );
-
-    static void addUnderburden( std::vector<QString>& formationNames,
-                                std::vector<double>&  formationValues,
-                                std::vector<double>&  faciesValues,
-                                std::vector<double>&  tvDepthValues,
-                                std::vector<double>&  measuredDepthValues,
-                                double                overburdenHeight,
-                                double                defaultPoroValue,
-                                const QString&        formationName,
-                                double                faciesValue );
-
-    caf::PdmPtrField<RimFractureModel*>                    m_fractureModel;
-    caf::PdmField<caf::AppEnum<RiaDefines::CurveProperty>> m_curveProperty;
-};

ApplicationCode/ProjectDataModel/RimFractureModelCurve.cpp

@@ -7,8 +7,8 @@
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
 //
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 //  FITNESS FOR A PARTICULAR PURPOSE.
 //
 //  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
@@ -177,3 +177,11 @@ void RimFractureModelCurve::performDataExtraction( bool* isUsingPseudoLength )
         }
     }
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RimFractureModelCurve::createCurveAutoName()
+{
+    return caf::AppEnum<RiaDefines::CurveProperty>::uiText( m_curveProperty() );
+}

ApplicationCode/ProjectDataModel/RimFractureModelCurve.h

@@ -7,8 +7,8 @@
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
 //
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 //  FITNESS FOR A PARTICULAR PURPOSE.
 //
 //  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
@@ -51,6 +51,8 @@ protected:
 
     void performDataExtraction( bool* isUsingPseudoLength ) override;
 
+    QString createCurveAutoName();
+
     caf::PdmPtrField<RimFractureModel*>                    m_fractureModel;
     caf::PdmField<caf::AppEnum<RiaDefines::CurveProperty>> m_curveProperty;
 };

ApplicationCode/ProjectDataModel/RimFractureModelStressCurve.cpp

@@ -1,162 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2020-     Equinor ASA
-//
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-//
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#include "RimFractureModelStressCurve.h"
-
-#include "RiaDefines.h"
-#include "RiaFractureModelDefines.h"
-#include "RigEclipseCaseData.h"
-#include "RigEclipseWellLogExtractor.h"
-#include "RigResultAccessorFactory.h"
-#include "RigWellLogCurveData.h"
-#include "RigWellPath.h"
-#include "RigWellPathGeometryTools.h"
-
-#include "RimCase.h"
-#include "RimEclipseCase.h"
-#include "RimFractureModel.h"
-#include "RimFractureModelCalculator.h"
-#include "RimFractureModelPlot.h"
-#include "RimModeledWellPath.h"
-#include "RimWellLogFile.h"
-#include "RimWellLogPlot.h"
-#include "RimWellPath.h"
-#include "RimWellPathCollection.h"
-#include "RimWellPlotTools.h"
-
-#include "RiaLogging.h"
-
-#include "cafPdmUiTreeOrdering.h"
-
-CAF_PDM_SOURCE_INIT( RimFractureModelStressCurve, "RimFractureModelStressCurve" );
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RimFractureModelStressCurve::RimFractureModelStressCurve()
-{
-    CAF_PDM_InitObject( "Fracture Model Curve", "", "", "" );
-
-    CAF_PDM_InitFieldNoDefault( &m_fractureModel, "FractureModel", "Fracture Model", "", "", "" );
-    m_fractureModel.uiCapability()->setUiTreeChildrenHidden( true );
-    m_fractureModel.uiCapability()->setUiHidden( true );
-
-    CAF_PDM_InitFieldNoDefault( &m_curveProperty, "CurveProperty", "Curve Property", "", "", "" );
-    m_curveProperty.uiCapability()->setUiHidden( true );
-
-    m_wellPath = nullptr;
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RimFractureModelStressCurve::~RimFractureModelStressCurve()
-{
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimFractureModelStressCurve::setCurveProperty( RiaDefines::CurveProperty curveProperty )
-{
-    m_curveProperty = curveProperty;
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-RiaDefines::CurveProperty RimFractureModelStressCurve::curveProperty() const
-{
-    return m_curveProperty();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimFractureModelStressCurve::setFractureModel( RimFractureModel* fractureModel )
-{
-    m_fractureModel = fractureModel;
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RimFractureModelStressCurve::performDataExtraction( bool* isUsingPseudoLength )
-{
-    std::vector<double> values;
-    std::vector<double> measuredDepthValues;
-    std::vector<double> tvDepthValues;
-    double              rkbDiff = 0.0;
-
-    RiaDefines::DepthUnitType depthUnit = RiaDefines::DepthUnitType::UNIT_METER;
-    QString                   xUnits    = RiaWellLogUnitTools<double>::noUnitString();
-
-    *isUsingPseudoLength = false;
-
-    bool isOk = m_fractureModel->calculator()->extractCurveData( curveProperty(),
-                                                                 m_fractureModel->timeStep(),
-                                                                 values,
-                                                                 measuredDepthValues,
-                                                                 tvDepthValues,
-                                                                 rkbDiff );
-    if ( !isOk )
-    {
-        return;
-    }
-
-    RimEclipseCase* eclipseCase = m_fractureModel->eclipseCase();
-    if ( eclipseCase && eclipseCase->eclipseCaseData()->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
-    {
-        // See https://github.com/OPM/ResInsight/issues/538
-
-        depthUnit = RiaDefines::DepthUnitType::UNIT_FEET;
-    }
-
-    bool performDataSmoothing = false;
-    if ( !values.empty() && !measuredDepthValues.empty() )
-    {
-        if ( tvDepthValues.empty() )
-        {
-            this->setValuesAndDepths( values,
-                                      measuredDepthValues,
-                                      RiaDefines::DepthTypeEnum::MEASURED_DEPTH,
-                                      0.0,
-                                      depthUnit,
-                                      !performDataSmoothing,
-                                      xUnits );
-        }
-        else
-        {
-            this->setValuesWithMdAndTVD( values,
-                                         measuredDepthValues,
-                                         tvDepthValues,
-                                         rkbDiff,
-                                         depthUnit,
-                                         !performDataSmoothing,
-                                         xUnits );
-        }
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-QString RimFractureModelStressCurve::createCurveAutoName()
-{
-    return caf::AppEnum<RiaDefines::CurveProperty>::uiText( m_curveProperty() );
-}

ApplicationCode/ProjectDataModel/RimFractureModelStressCurve.h

@@ -1,63 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (C) 2020-     Equinor ASA
-//
-//  ResInsight is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
-//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-//  FITNESS FOR A PARTICULAR PURPOSE.
-//
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
-//  for more details.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "RimFractureModelPropertyCurve.h"
-#include "RimWellLogExtractionCurve.h"
-
-#include "RiuQwtSymbol.h"
-
-#include "cafPdmField.h"
-#include "cafPdmPtrField.h"
-
-#include <vector>
-
-class RimWellPath;
-class RimWellMeasurement;
-class RimFractureModel;
-class RimColorLegend;
-
-//==================================================================================================
-///
-//==================================================================================================
-class RimFractureModelStressCurve : public RimWellLogExtractionCurve, public RimFractureModelPropertyCurve
-{
-    CAF_PDM_HEADER_INIT;
-
-public:
-    RimFractureModelStressCurve();
-    ~RimFractureModelStressCurve() override;
-
-    void setFractureModel( RimFractureModel* fractureModel );
-
-    void                      setCurveProperty( RiaDefines::CurveProperty ) override;
-    RiaDefines::CurveProperty curveProperty() const override;
-
-protected:
-    QString createCurveAutoName() override;
-
-    void performDataExtraction( bool* isUsingPseudoLength ) override;
-
-    static void addDatapointsForBottomOfLayers( std::vector<double>&       tvDepthValues,
-                                                std::vector<double>&       stress,
-                                                const std::vector<double>& stressGradients );
-
-    caf::PdmPtrField<RimFractureModel*>                    m_fractureModel;
-    caf::PdmField<caf::AppEnum<RiaDefines::CurveProperty>> m_curveProperty;
-};

ApplicationCode/ProjectDataModel/RimLayerCurve.cpp

@@ -74,9 +74,10 @@ void RimLayerCurve::performDataExtraction( bool* isUsingPseudoLength )
 
     *isUsingPseudoLength = false;
 
-    RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( m_case.value() );
+    if ( m_fractureModel && m_fractureModel->eclipseCase() )
-    if ( eclipseCase && m_fractureModel )
     {
+        RimEclipseCase* eclipseCase = m_fractureModel->eclipseCase();
+
         bool isOk = m_fractureModel->calculator()->extractCurveData( curveProperty(),
                                                                      m_timeStep,
                                                                      values,