Convert to enum class

2025-02-25 18:55:39 -06:00 · 2020-04-23 23:25:22 +02:00
parent 8aa36ee31e
commit 3f88fe197a
56 changed files with 696 additions and 542 deletions
--- a/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
@@ -192,7 +192,7 @@ std::vector<RigCompletionData>
    if ( pdParams.performScaling )
    {
        RigCaseCellResultsData* results = caseToApply->results( RiaDefines::MATRIX_MODEL );
-        results->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::DYNAMIC_NATIVE, "PRESSURE" ) );
+        results->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "PRESSURE" ) );
    }

    return generateCompdatValuesConst( caseToApply,
@@ -266,8 +266,8 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
    const std::vector<double>*              currentMatrixPressures = nullptr;
    if ( performPressureDepletionScaling )
    {
-        pressureResultVector =
-            &results->cellScalarResults( RigEclipseResultAddress( RiaDefines::DYNAMIC_NATIVE, "PRESSURE" ) );
+        pressureResultVector = &results->cellScalarResults(
+            RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "PRESSURE" ) );
        CVF_ASSERT( !pressureResultVector->empty() );

        if ( pdParams.pressureScalingTimeStep < static_cast<int>( pressureResultVector->size() ) )
@@ -832,9 +832,9 @@ void RicExportFractureCompletionsImpl::outputIntermediateResultsText( QTextStrea
 bool RicExportFractureCompletionsImpl::loadResultsByName( RigCaseCellResultsData*     cellResultsData,
                                                          const std::vector<QString>& resultNames )
 {
-    const std::vector<RiaDefines::ResultCatType> resultCategorySearchOrder = {RiaDefines::STATIC_NATIVE,
-                                                                              RiaDefines::INPUT_PROPERTY,
-                                                                              RiaDefines::GENERATED};
+    const std::vector<RiaDefines::ResultCatType> resultCategorySearchOrder = {RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                              RiaDefines::ResultCatType::INPUT_PROPERTY,
+                                                                              RiaDefines::ResultCatType::GENERATED};

    bool foundDataForAllResults = true;

--- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
@@ -1286,29 +1286,32 @@ CellDirection RicWellPathExportCompletionDataFeatureImpl::calculateCellMainDirec
    RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();

    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DX" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DX" ) );
    cvf::ref<RigResultAccessor> dxAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DX" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DX" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DY" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DY" ) );
    cvf::ref<RigResultAccessor> dyAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DY" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DY" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DZ" ) );
    cvf::ref<RigResultAccessor> dzAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DZ" ) );

    double xLengthFraction = fabs( lengthsInCell.x() / dxAccessObject->cellScalarGlobIdx( globalCellIndex ) );
    double yLengthFraction = fabs( lengthsInCell.y() / dyAccessObject->cellScalarGlobIdx( globalCellIndex ) );
@@ -1345,54 +1348,60 @@ TransmissibilityData
    RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();

    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DX" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DX" ) );
    cvf::ref<RigResultAccessor> dxAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DX" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DX" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DY" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DY" ) );
    cvf::ref<RigResultAccessor> dyAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DY" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DY" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DZ" ) );
    cvf::ref<RigResultAccessor> dzAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DZ" ) );

    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMX" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMX" ) );
    cvf::ref<RigResultAccessor> permxAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMX" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "PERMX" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMY" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMY" ) );
    cvf::ref<RigResultAccessor> permyAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMY" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "PERMY" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMZ" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMZ" ) );
    cvf::ref<RigResultAccessor> permzAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMZ" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "PERMZ" ) );

    if ( dxAccessObject.isNull() || dyAccessObject.isNull() || dzAccessObject.isNull() || permxAccessObject.isNull() ||
         permyAccessObject.isNull() || permzAccessObject.isNull() )
@@ -1404,14 +1413,15 @@ TransmissibilityData
    {
        // Trigger loading from file
        eclipseCase->results( RiaDefines::MATRIX_MODEL )
-            ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ) );
+            ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "NTG" ) );

        cvf::ref<RigResultAccessor> ntgAccessObject =
            RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                               0,
                                                               RiaDefines::MATRIX_MODEL,
                                                               0,
-                                                               RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ) );
+                                                               RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                        "NTG" ) );

        if ( ntgAccessObject.notNull() )
        {
@@ -1495,13 +1505,14 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateDFactor( RimEclipseC
    double porosity = 0.0;
    {
        eclipseCase->results( RiaDefines::MATRIX_MODEL )
-            ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PORO" ) );
+            ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORO" ) );
        cvf::ref<RigResultAccessor> poroAccessObject =
            RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                               0,
                                                               RiaDefines::MATRIX_MODEL,
                                                               0,
-                                                               RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PORO" ) );
+                                                               RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                        "PORO" ) );

        if ( poroAccessObject.notNull() )
        {
@@ -1538,65 +1549,72 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAsEc
    RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();

    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DX" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DX" ) );
    cvf::ref<RigResultAccessor> dxAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DX" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DX" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DY" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DY" ) );
    cvf::ref<RigResultAccessor> dyAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DY" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DY" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DZ" ) );
    cvf::ref<RigResultAccessor> dzAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "DZ" ) );

    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMX" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMX" ) );
    cvf::ref<RigResultAccessor> permxAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMX" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "PERMX" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMY" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMY" ) );
    cvf::ref<RigResultAccessor> permyAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMY" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "PERMY" ) );
    eclipseCase->results( RiaDefines::MATRIX_MODEL )
-        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMZ" ) );
+        ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PERMZ" ) );
    cvf::ref<RigResultAccessor> permzAccessObject =
        RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                           0,
                                                           RiaDefines::MATRIX_MODEL,
                                                           0,
-                                                           RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PERMZ" ) );
+                                                           RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                    "PERMZ" ) );

    double ntg = 1.0;
    if ( eclipseCase->results( RiaDefines::MATRIX_MODEL )
-             ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ) ) )
+             ->ensureKnownResultLoaded( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "NTG" ) ) )
    {
        cvf::ref<RigResultAccessor> ntgAccessObject =
            RigResultAccessorFactory::createFromResultAddress( eclipseCaseData,
                                                               0,
                                                               RiaDefines::MATRIX_MODEL,
                                                               0,
-                                                               RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ) );
+                                                               RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                                        "NTG" ) );
        ntg = ntgAccessObject->cellScalarGlobIdx( globalCellIndex );
    }

--- a/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
@@ -165,8 +165,9 @@ void RicExportEclipseSectorModelUi::setCaseData( RigEclipseCaseData* caseData /*
    {
        for ( QString keyword : mainKeywords() )
        {
-            if ( caseData && caseData->results( RiaDefines::MATRIX_MODEL )
-                                 ->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, keyword ) ) )
+            if ( caseData &&
+                 caseData->results( RiaDefines::MATRIX_MODEL )
+                     ->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, keyword ) ) )
            {
                selectedKeywords.v().push_back( keyword );
            }
@@ -177,8 +178,9 @@ void RicExportEclipseSectorModelUi::setCaseData( RigEclipseCaseData* caseData /*
        std::vector<QString> validSelectedKeywords;
        for ( QString keyword : selectedKeywords() )
        {
-            if ( caseData && caseData->results( RiaDefines::MATRIX_MODEL )
-                                 ->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, keyword ) ) )
+            if ( caseData &&
+                 caseData->results( RiaDefines::MATRIX_MODEL )
+                     ->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, keyword ) ) )
            {
                validSelectedKeywords.push_back( keyword );
            }
@@ -439,7 +441,8 @@ QList<caf::PdmOptionItemInfo>
    {
        RigCaseCellResultsData*       resultData = m_caseData->results( RiaDefines::MATRIX_MODEL );
        QList<caf::PdmOptionItemInfo> allOptions =
-            RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard( RiaDefines::STATIC_NATIVE, resultData );
+            RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard( RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                               resultData );

        std::set<QString> mainKeywords = this->mainKeywords();
        for ( caf::PdmOptionItemInfo option : allOptions )
@@ -447,7 +450,7 @@ QList<caf::PdmOptionItemInfo>
            if ( mainKeywords.count( option.optionUiText() ) )
            {
                if ( resultData->hasResultEntry(
-                         RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, option.optionUiText() ) ) )
+                         RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, option.optionUiText() ) ) )
                {
                    options.push_back( option );
                }
@@ -458,7 +461,7 @@ QList<caf::PdmOptionItemInfo>
            if ( !mainKeywords.count( option.optionUiText() ) && option.optionUiText() != "None" )
            {
                if ( resultData->hasResultEntry(
-                         RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, option.optionUiText() ) ) )
+                         RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, option.optionUiText() ) ) )
                {
                    if ( option.optionUiText() == "ACTNUM" && exportGrid() )
                    {
@@ -606,7 +609,7 @@ void RicExportEclipseSectorModelUi::removeInvalidKeywords()
    std::vector<QString> validKeywords;
    for ( QString keyword : selectedKeywords() )
    {
-        if ( resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, keyword ) ) )
+        if ( resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, keyword ) ) )
        {
            validKeywords.push_back( keyword );
        }
--- a/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
+++ b/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
@@ -109,7 +109,7 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells( Rim
    }

    viewToModify->setCurrentTimeStep( timeStep );
-    viewToModify->cellResult()->setResultType( RiaDefines::FLOW_DIAGNOSTICS );
+    viewToModify->cellResult()->setResultType( RiaDefines::ResultCatType::FLOW_DIAGNOSTICS );
    viewToModify->cellResult()->setResultVariable( "MaxFractionTracer" );
    viewToModify->cellResult()->setFlowSolution( flowDiagSolution );

--- a/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp
+++ b/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp
@@ -79,19 +79,20 @@ std::vector<RimSaturationPressurePlot*>
        {
            RigCaseCellResultsData* resultData = eclipseCaseData->results( RiaDefines::MATRIX_MODEL );

-            if ( !resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::DYNAMIC_NATIVE, "PRESSURE" ) ) )
+            if ( !resultData->hasResultEntry(
+                     RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "PRESSURE" ) ) )
            {
                RiaLogging::error( "CreateSaturationPressurePlots : PRESSURE is not available " );
                return plots;
            }

-            if ( !resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::DYNAMIC_NATIVE, "PDEW" ) ) )
+            if ( !resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "PDEW" ) ) )
            {
                RiaLogging::error( "CreateSaturationPressurePlots : PDEW is not available " );
                return plots;
            }

-            if ( !resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::DYNAMIC_NATIVE, "PBUB" ) ) )
+            if ( !resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, "PBUB" ) ) )
            {
                RiaLogging::error( "CreateSaturationPressurePlots : PBUB is not available " );
                return plots;
--- a/ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
+++ b/ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
@@ -235,7 +235,7 @@ RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMap(

    // Set default values
    {
-        contourMap->cellResult()->setResultType( RiaDefines::DYNAMIC_NATIVE );
+        contourMap->cellResult()->setResultType( RiaDefines::ResultCatType::DYNAMIC_NATIVE );

        if ( RiaApplication::instance()->preferences()->loadAndShowSoil )
        {