#1068 Renamed to RigEclipseCaseData

2025-02-25 18:55:39 -06:00 · 2017-01-10 09:51:39 +01:00
parent 36c008a12c
commit 8970d93a4d
83 changed files with 265 additions and 269 deletions
--- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@@ -21,7 +21,7 @@
 #include "Rim3dOverlayInfoConfig.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigEclipseNativeVisibleCellsStatCalc.h"
 #include "RigFemNativeVisibleCellsStatCalc.h"
 #include "RigFemPartCollection.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
@@ -25,7 +25,7 @@

 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"

 #include "RimCaseCollection.h"
@@ -120,7 +120,7 @@ RimEclipseCase::~RimEclipseCase()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RigCaseData* RimEclipseCase::reservoirData()
+RigEclipseCaseData* RimEclipseCase::reservoirData()
 {
    return m_rigEclipseCase.p();
 }
@@ -128,7 +128,7 @@ RigCaseData* RimEclipseCase::reservoirData()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-const RigCaseData* RimEclipseCase::reservoirData() const
+const RigEclipseCaseData* RimEclipseCase::reservoirData() const
 {
    return m_rigEclipseCase.p();
 }
@@ -294,7 +294,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
    }
    else if (changedField == &flipXAxis || changedField == &flipYAxis)
    {
-        RigCaseData* rigEclipseCase = reservoirData();
+        RigEclipseCaseData* rigEclipseCase = reservoirData();
        if (rigEclipseCase)
        {
            rigEclipseCase->mainGrid()->setFlipAxis(flipXAxis, flipYAxis);
@@ -323,7 +323,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
 //--------------------------------------------------------------------------------------------------
 void RimEclipseCase::updateFormationNamesData()
 {
-    RigCaseData* rigEclipseCase = reservoirData();
+    RigEclipseCaseData* rigEclipseCase = reservoirData();
    if(rigEclipseCase)
    {
        if(activeFormationNames())
@@ -381,7 +381,7 @@ void RimEclipseCase::updateFormationNamesData()
 //--------------------------------------------------------------------------------------------------
 void RimEclipseCase::computeCachedData()
 {
-    RigCaseData* rigEclipseCase = reservoirData();
+    RigEclipseCaseData* rigEclipseCase = reservoirData();
    if (rigEclipseCase)
    {
        caf::ProgressInfo pInf(30, "");
@@ -425,7 +425,7 @@ RimCaseCollection* RimEclipseCase::parentCaseCollection()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseCase::setReservoirData(RigCaseData* eclipseCase)
+void RimEclipseCase::setReservoirData(RigEclipseCaseData* eclipseCase)
 {
    m_rigEclipseCase  = eclipseCase;
    if (this->reservoirData())
--- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h
@@ -36,7 +36,7 @@

 class QString;

-class RigCaseData;
+class RigEclipseCaseData;
 class RigGridBase;
 class RimCaseCollection;
 class RimIdenticalGridCaseGroup;
@@ -68,8 +68,8 @@ public:
    bool                                        openReserviorCase();
    virtual bool                                openEclipseGridFile() = 0;
                                                      
-    RigCaseData*                                reservoirData();
-    const RigCaseData*                          reservoirData() const;
+    RigEclipseCaseData*                                reservoirData();
+    const RigEclipseCaseData*                          reservoirData() const;

    RimReservoirCellResultsStorage*             results(RifReaderInterface::PorosityModelResultType porosityModel);
                                                      
@@ -104,10 +104,10 @@ protected:
    // Internal methods
 protected:
    void                                        computeCachedData();
-    void                                        setReservoirData(RigCaseData* eclipseCase);
+    void                                        setReservoirData(RigEclipseCaseData* eclipseCase);

 private:
-    cvf::ref<RigCaseData>                       m_rigEclipseCase;
+    cvf::ref<RigEclipseCaseData>                       m_rigEclipseCase;

 private:
    caf::PdmChildField<RimReservoirCellResultsStorage*> m_matrixModelResults;
--- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp
@@ -22,7 +22,7 @@

 #include "RiaApplication.h"

-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigGridManager.h"
 #include "RigMainGrid.h"

@@ -76,7 +76,7 @@ RimIdenticalGridCaseGroup* RimEclipseCaseCollection::createIdenticalCaseGroupFro
 {
    CVF_ASSERT(mainCase);

-    RigCaseData* rigEclipseCase = mainCase->reservoirData();
+    RigEclipseCaseData* rigEclipseCase = mainCase->reservoirData();
    RigMainGrid* equalGrid = registerCaseInGridCollection(rigEclipseCase);
    CVF_ASSERT(equalGrid);

@@ -101,7 +101,7 @@ void RimEclipseCaseCollection::moveEclipseCaseIntoCaseGroup(RimEclipseCase* rimR
 {
    CVF_ASSERT(rimReservoir);

-    RigCaseData* rigEclipseCase = rimReservoir->reservoirData();
+    RigEclipseCaseData* rigEclipseCase = rimReservoir->reservoirData();
    RigMainGrid* equalGrid = registerCaseInGridCollection(rigEclipseCase);
    CVF_ASSERT(equalGrid);

@@ -155,7 +155,7 @@ void RimEclipseCaseCollection::removeCaseFromAllGroups(RimEclipseCase* reservoir
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection(RigCaseData* rigEclipseCase)
+RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection(RigEclipseCaseData* rigEclipseCase)
 {
    CVF_ASSERT(rigEclipseCase);

@@ -188,7 +188,7 @@ void RimEclipseCaseCollection::insertCaseInCaseGroup(RimIdenticalGridCaseGroup*
 {
    CVF_ASSERT(rimReservoir);

-    RigCaseData* rigEclipseCase = rimReservoir->reservoirData();
+    RigEclipseCaseData* rigEclipseCase = rimReservoir->reservoirData();
    registerCaseInGridCollection(rigEclipseCase);

    caseGroup->addCase(rimReservoir);
--- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h
@@ -27,7 +27,7 @@

 #include "cvfObject.h"

-class RigCaseData;
+class RigEclipseCaseData;
 class RigGridManager;
 class RigMainGrid;
 class RimEclipseCase;
@@ -59,6 +59,6 @@ public:
    void                                                recomputeStatisticsForAllCaseGroups();

 private:
-    RigMainGrid*                                        registerCaseInGridCollection(RigCaseData* rigEclipseCase);
+    RigMainGrid*                                        registerCaseInGridCollection(RigEclipseCaseData* rigEclipseCase);
    cvf::ref<RigGridManager>                            m_gridCollection;
 };
--- a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
@@ -30,7 +30,7 @@

 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"

 #include "RimDefines.h"
@@ -96,7 +96,7 @@ void RimEclipseInputCase::openDataFileSet(const QStringList& fileNames)

    if (this->reservoirData() == NULL) 
    {
-        this->setReservoirData(new RigCaseData);
+        this->setReservoirData(new RigEclipseCaseData);
    }

    // First find and read the grid data 
@@ -193,7 +193,7 @@ bool RimEclipseInputCase::openEclipseGridFile()
            readerInterface = new RifReaderEclipseInput;
            readerInterface->setReaderSetting(prefs->readerSettings());

-            cvf::ref<RigCaseData> eclipseCase = new RigCaseData;
+            cvf::ref<RigEclipseCaseData> eclipseCase = new RigEclipseCaseData;
            if (!readerInterface->open(m_gridFileName, eclipseCase.p()))
            {
                return false;
@@ -335,7 +335,7 @@ void RimEclipseInputCase::loadAndSyncronizeInputProperties()
 //--------------------------------------------------------------------------------------------------
 cvf::ref<RifReaderInterface> RimEclipseInputCase::createMockModel(QString modelName)
 {
-    cvf::ref<RigCaseData> reservoir = new RigCaseData;
+    cvf::ref<RigEclipseCaseData> reservoir = new RigEclipseCaseData;
    cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel;

    if (modelName == RimDefines::mockModelBasicInputCase())
--- a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp
@@ -25,7 +25,7 @@
 #include "RifReaderSettings.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"

 #include "RimEclipseCase.h"
@@ -162,7 +162,7 @@ void RimEclipseInputCaseOpm::importEclipseGridAndProperties(const QString& fileN
 {
    if (this->reservoirData() == NULL)
    {
-        this->setReservoirData(new RigCaseData);
+        this->setReservoirData(new RigEclipseCaseData);

        RifReaderOpmParserInput::importGridPropertiesFaults(fileName, reservoirData());

--- a/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp
@@ -21,7 +21,7 @@
 #include "RimEclipseInputProperty.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"

 #include "RimEclipseInputCase.h"
 #include "RimEclipseResultDefinition.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
@@ -21,7 +21,7 @@
 #include "RimEclipsePropertyFilter.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigFormationNames.h"

 #include "RimEclipseCase.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
@@ -28,7 +28,7 @@
 #include "RifReaderSettings.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"

 #include "RimMockModelSettings.h"
@@ -110,7 +110,7 @@ bool RimEclipseResultCase::openEclipseGridFile()
        readerInterface->setReaderSetting(prefs->readerSettings());
        readerInterface->setFilenamesWithFaults(this->filesContainingFaults());

-        cvf::ref<RigCaseData> eclipseCase = new RigCaseData;
+        cvf::ref<RigEclipseCaseData> eclipseCase = new RigEclipseCaseData;
        if (!readerInterface->open(caseFileName(), eclipseCase.p()))
        {
            return false;
@@ -141,7 +141,7 @@ bool RimEclipseResultCase::openEclipseGridFile()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase)
+bool RimEclipseResultCase::openAndReadActiveCellData(RigEclipseCaseData* mainEclipseCase)
 {
    // Early exit if data is already read
    if (m_activeCellInfoIsReadFromFile) return true;
@@ -158,7 +158,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCas
            return false;
        }

-        cvf::ref<RigCaseData> eclipseCase = new RigCaseData;
+        cvf::ref<RigEclipseCaseData> eclipseCase = new RigEclipseCaseData;

        CVF_ASSERT(mainEclipseCase && mainEclipseCase->mainGrid());
        eclipseCase->setMainGrid(mainEclipseCase->mainGrid());
@@ -204,7 +204,7 @@ bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCas
 cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel(QString modelName)
 {
    cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel;
-    cvf::ref<RigCaseData> reservoir = new RigCaseData;
+    cvf::ref<RigEclipseCaseData> reservoir = new RigEclipseCaseData;

     if (modelName == RimDefines::mockModelBasic())
    {
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
@@ -44,7 +44,7 @@ public:
    void                        setCaseInfo(const QString& userDescription, const QString& caseFileName);

    virtual bool                openEclipseGridFile();
-    bool                        openAndReadActiveCellData(RigCaseData* mainEclipseCase);
+    bool                        openAndReadActiveCellData(RigEclipseCaseData* mainEclipseCase);
    void                        readGridDimensions(std::vector< std::vector<int> >& gridDimensions);

    // Overrides from RimCase
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
@@ -22,7 +22,7 @@

 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"

 #include "RimCellEdgeColors.h"
 #include "RimEclipseCase.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
@@ -23,7 +23,7 @@
 #include "RicNewViewFeature.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigSingleWellResultsData.h"

 #include "RimCaseCollection.h"
@@ -143,7 +143,7 @@ bool RimEclipseStatisticsCase::openEclipseGridFile()
 {
    if (this->reservoirData()) return true;

-    cvf::ref<RigCaseData> eclipseCase = new RigCaseData;
+    cvf::ref<RigEclipseCaseData> eclipseCase = new RigEclipseCaseData;

    CVF_ASSERT(parentStatisticsCaseCollection());

@@ -228,7 +228,7 @@ void RimEclipseStatisticsCase::computeStatistics()
        timeStepIndices.push_back(i);
    }

-    RigCaseData* resultCase = reservoirData();
+    RigEclipseCaseData* resultCase = reservoirData();

    QList<RimEclipseStatisticsCaseEvaluator::ResSpec > resultSpecification;

@@ -395,7 +395,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseStatisticsCase::calculateValueOptions(co
        return options;
    }

-    RigCaseData* caseData = idgcg->mainCase()->reservoirData();
+    RigEclipseCaseData* caseData = idgcg->mainCase()->reservoirData();

    if (&m_selectedDynamicProperties == fieldNeedingOptions)
    {
@@ -716,7 +716,7 @@ void RimEclipseStatisticsCase::populateResultSelection()
        return;
    }

-    RigCaseData* caseData = idgcg->mainCase()->reservoirData();
+    RigEclipseCaseData* caseData = idgcg->mainCase()->reservoirData();

    if (m_selectedDynamicProperties().size() == 0)
    {
--- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp
@@ -21,7 +21,7 @@
 #include "RimEclipseStatisticsCaseEvaluator.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
 #include "RigResultModifier.h"
@@ -317,7 +317,7 @@ void RimEclipseStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>&
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseStatisticsCaseEvaluator::RimEclipseStatisticsCaseEvaluator(const std::vector<RimEclipseCase*>& sourceCases, const std::vector<size_t>& timeStepIndices, const RimStatisticsConfig& statisticsConfig, RigCaseData* destinationCase, RimIdenticalGridCaseGroup* identicalGridCaseGroup)
+RimEclipseStatisticsCaseEvaluator::RimEclipseStatisticsCaseEvaluator(const std::vector<RimEclipseCase*>& sourceCases, const std::vector<size_t>& timeStepIndices, const RimStatisticsConfig& statisticsConfig, RigEclipseCaseData* destinationCase, RimIdenticalGridCaseGroup* identicalGridCaseGroup)
    :   m_sourceCases(sourceCases),
    m_statisticsConfig(statisticsConfig),
    m_destinationCase(destinationCase),
--- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.h
@@ -28,7 +28,7 @@


 class RimEclipseCase;
-class RigCaseData;
+class RigEclipseCaseData;
 class RigCaseCellResultsData;


@@ -59,7 +59,7 @@ public:
    RimEclipseStatisticsCaseEvaluator(const std::vector<RimEclipseCase*>& sourceCases,
                               const std::vector<size_t>& timeStepIndices,
                               const RimStatisticsConfig& statisticsConfig,
-                               RigCaseData* destinationCase,
+                               RigEclipseCaseData* destinationCase,
                               RimIdenticalGridCaseGroup* identicalGridCaseGroup);

    struct ResSpec 
@@ -90,7 +90,7 @@ private:

    size_t                 m_reservoirCellCount;
    RimStatisticsConfig    m_statisticsConfig;
-    RigCaseData*           m_destinationCase;
+    RigEclipseCaseData*           m_destinationCase;
    RimIdenticalGridCaseGroup* m_identicalGridCaseGroup;
    bool                    m_useZeroAsInactiveCellValue;
 };
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@@ -25,7 +25,7 @@

 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigFlowDiagResults.h"
 #include "RigFormationNames.h"
 #include "RigMainGrid.h"
@@ -944,7 +944,7 @@ void RimEclipseView::updateLegends()
        return;
    }

-    RigCaseData* eclipseCase = m_reservoir->reservoirData();
+    RigEclipseCaseData* eclipseCase = m_reservoir->reservoirData();
    CVF_ASSERT(eclipseCase);

    RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResult()->porosityModel());
--- a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp
@@ -22,7 +22,7 @@

 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigFlowDiagResults.h"
 #include "RigMainGrid.h"
 #include "RigSingleWellResultsData.h"
--- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
+++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
@@ -23,7 +23,7 @@
 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigGridManager.h"
 #include "RigMainGrid.h"

@@ -181,7 +181,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
        return;
    }

-    RigCaseData* rigCaseData = mainCase->reservoirData();
+    RigEclipseCaseData* rigCaseData = mainCase->reservoirData();
    CVF_ASSERT(rigCaseData);

    RifReaderInterface::PorosityModelResultType poroModel = RifReaderInterface::MATRIX_RESULTS;
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -23,7 +23,7 @@
 #include "RiaApplication.h"
 #include "RiaVersionInfo.h"

-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigGridBase.h"

 #include "RimCalcScript.h"
--- a/ApplicationCode/ProjectDataModel/RimProject.h
+++ b/ApplicationCode/ProjectDataModel/RimProject.h
@@ -26,7 +26,7 @@

 #include <vector>

-class RigCaseData;
+class RigEclipseCaseData;
 class RigGridManager;
 class RigMainGrid;

--- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
@@ -21,7 +21,7 @@

 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigCell.h"
 #include "RigMainGrid.h"

@@ -1518,17 +1518,17 @@ double RimReservoirCellResultsStorage::darchysValue()

    if (rimCase && rimCase->reservoirData())
    {
-        RigCaseData::UnitsType unitsType = rimCase->reservoirData()->unitsType();
+        RigEclipseCaseData::UnitsType unitsType = rimCase->reservoirData()->unitsType();

-        if (unitsType == RigCaseData::UNITS_FIELD)
+        if (unitsType == RigEclipseCaseData::UNITS_FIELD)
        {
            darchy = 0.001127;
        }
-        else if (unitsType == RigCaseData::UNITS_METRIC)
+        else if (unitsType == RigEclipseCaseData::UNITS_METRIC)
        {
            darchy = 0.008527;
        }
-        else if (unitsType == RigCaseData::UNITS_LAB)
+        else if (unitsType == RigEclipseCaseData::UNITS_LAB)
        {
            darchy = 3.6;
        }
--- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
@@ -22,7 +22,7 @@
 #include "RiaApplication.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigEclipseCaseData.h"
 #include "RigEclipseWellLogExtractor.h"
 #include "RigFemPartResultsCollection.h"
 #include "RigGeoMechCaseData.h"
@@ -260,8 +260,8 @@ void RimWellLogExtractionCurve::onLoadDataAndUpdate()
                eclExtractor->curveData(resAcc.p(), &values);
            }

-            RigCaseData::UnitsType eclipseUnitsType = eclipseCase->reservoirData()->unitsType();
-            if (eclipseUnitsType == RigCaseData::UNITS_FIELD)
+            RigEclipseCaseData::UnitsType eclipseUnitsType = eclipseCase->reservoirData()->unitsType();
+            if (eclipseUnitsType == RigEclipseCaseData::UNITS_FIELD)
            {
                // See https://github.com/OPM/ResInsight/issues/538
                
--- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp
@@ -62,7 +62,7 @@ RigEclipseWellLogExtractor* RimWellLogPlotCollection::findOrCreateExtractor(RimW
        return NULL;
    }

-    RigCaseData* eclCaseData = eclCase->reservoirData();
+    RigEclipseCaseData* eclCaseData = eclCase->reservoirData();
    RigWellPath* wellPathGeom = wellPath->wellPathGeometry();
    for (size_t exIdx = 0; exIdx < m_extractors.size(); ++exIdx)
    {
@@ -131,7 +131,7 @@ void RimWellLogPlotCollection::removeExtractors(const RigWellPath* wellPath)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLogPlotCollection::removeExtractors(const RigCaseData* caseData)
+void RimWellLogPlotCollection::removeExtractors(const RigEclipseCaseData* caseData)
 {
    for (int eIdx = (int) m_extractors.size() - 1; eIdx >= 0; eIdx--)
    {
--- a/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.h
@@ -28,7 +28,7 @@ class RimWellLogPlot;
 class RigEclipseWellLogExtractor;
 class RigGeoMechWellLogExtractor;
 class RimGeoMechCase;
-class RigCaseData;
+class RigEclipseCaseData;
 class RigGeoMechCaseData;
 class RigWellPath;
 class RimWellPath;
@@ -50,7 +50,7 @@ public:
    RigGeoMechWellLogExtractor* findOrCreateExtractor(RimWellPath* wellPath, RimGeoMechCase* eclCase);

    void removeExtractors(const RigWellPath* wellPath);
-    void removeExtractors(const RigCaseData* caseData);
+    void removeExtractors(const RigEclipseCaseData* caseData);
    void removeExtractors(const RigGeoMechCaseData* caseData);

    caf::PdmChildArrayField<RimWellLogPlot*> wellLogPlots;