Janitor: add result name for "PORV".

ApplicationLibCode/Application/RiaResultNames.cpp

@@ -437,6 +437,14 @@ QString RiaResultNames::facies()
     return "FACIES";
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaResultNames::porv()
+{
+    return "PORV";
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Application/RiaResultNames.h

@@ -83,6 +83,7 @@ RigEclipseResultAddress staticIntegerAddress( const QString& resultName );
 QString faultDistanceName();
 QString facies();
 
+QString porv();
 QString soil();
 QString sgas();
 QString swat();

ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp

@@ -21,6 +21,7 @@
 #include "RiaEclipseFileNameTools.h"
 #include "RiaLogging.h"
 #include "RiaQDateTimeTools.h"
+#include "RiaResultNames.h"
 #include "RiaStdStringTools.h"
 
 #include "RifEclipseOutputFileTools.h"
@@ -1067,7 +1068,7 @@ std::vector<std::vector<int>> RifReaderOpmCommon::readActiveCellInfoFromPorv( Ri
 
     for ( int gridIdx = 0; gridIdx < nGrids; gridIdx++ )
     {
-        auto porvValues = m_initFile->getInitData<float>( "PORV", m_gridNames[gridIdx] );
+        auto porvValues = m_initFile->getInitData<float>( RiaResultNames::porv().toStdString(), m_gridNames[gridIdx] );
 
         int activeCellCount = (int)porvValues.size();
         if ( divideCellCountByTwo )

ApplicationLibCode/ReservoirDataModel/ResultCalculators/RigMobilePoreVolumeResultCalculator.cpp

@@ -64,8 +64,10 @@ void RigMobilePoreVolumeResultCalculator::calculate( const RigEclipseResultAddre
     const std::vector<double>* swcrResults   = nullptr;
     const std::vector<double>* multpvResults = nullptr;
 
-    porvResults =
-        RigCaseCellResultsData::getResultIndexableStaticResult( m_resultsData->activeCellInfo(), m_resultsData, "PORV", porvDataTemp );
+    porvResults = RigCaseCellResultsData::getResultIndexableStaticResult( m_resultsData->activeCellInfo(),
+                                                                          m_resultsData,
+                                                                          RiaResultNames::porv(),
+                                                                          porvDataTemp );
     if ( !porvResults || porvResults->empty() )
     {
         RiaLogging::error( "Assumed PORV, but not data was found." );

ApplicationLibCode/ReservoirDataModel/ResultCalculators/RigPorvSoilSgasResultCalculator.cpp

@@ -56,7 +56,7 @@ void RigPorvSoilSgasResultCalculator::calculate( const RigEclipseResultAddress&
 {
     RigEclipseResultAddress soilAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::soil() );
     RigEclipseResultAddress sgasAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::sgas() );
-    RigEclipseResultAddress porvAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORV" );
+    RigEclipseResultAddress porvAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::porv() );
 
     if ( resVarAddr.resultName() == RiaResultNames::riPorvSoil() )
     {

ApplicationLibCode/ReservoirDataModel/RigCaseCellResultsData.cpp

@@ -1125,7 +1125,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries()
 
     // Mobile Pore Volume
     {
-        if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORV" ) ) )
+        if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::porv() ) ) )
         {
             if ( !hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::mobilePoreVolumeName() ) ) )
             {
@@ -1141,7 +1141,7 @@ void RigCaseCellResultsData::createPlaceholderResultEntries()
         findOrCreateScalarResultIndex( RiaResultNames::staticIntegerAddress( RiaResultNames::indexKResultName() ), needsToBeStored );
     }
 
-    if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORV" ) ) )
+    if ( hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::porv() ) ) )
     {
         bool hasSgas = hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::sgas() ) );
         bool hasSoil = hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::DYNAMIC_NATIVE, RiaResultNames::soil() ) );

ApplicationLibCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp

@@ -56,7 +56,10 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
     // PORV
     const std::vector<double>* porvResults = nullptr;
     std::vector<double>        porvActiveCellsResultStorage;
-    porvResults = RigCaseCellResultsData::getResultIndexableStaticResult( actCellInfo, gridCellResults, "PORV", porvActiveCellsResultStorage );
+    porvResults = RigCaseCellResultsData::getResultIndexableStaticResult( actCellInfo,
+                                                                          gridCellResults,
+                                                                          RiaResultNames::porv(),
+                                                                          porvActiveCellsResultStorage );
 
     progress.incrementProgress();
 

ApplicationLibCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp

@@ -57,8 +57,10 @@ RigTofAccumulatedPhaseFractionsCalculator::RigTofAccumulatedPhaseFractionsCalcul
                                                                             RiaDefines::ResultCatType::DYNAMIC_NATIVE,
                                                                             RiaResultNames::sgas(),
                                                                             timestep );
-    const std::vector<double>* porvResults =
-        eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL, RiaDefines::ResultCatType::STATIC_NATIVE, "PORV", 0 );
+    const std::vector<double>* porvResults = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
+                                                                            RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                            RiaResultNames::porv(),
+                                                                            0 );
 
     RimFlowDiagSolution* flowDiagSolution = caseToApply->defaultFlowDiagSolution();
 

ApplicationLibCode/ReservoirDataModel/RigTofWellDistributionCalculator.cpp

@@ -61,8 +61,10 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator( RimEclipseRe
     RigFlowDiagResults* flowDiagResults = flowDiagSolution->flowDiagResults();
     CVF_ASSERT( flowDiagResults );
 
-    const std::vector<double>* porvResults =
-        eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL, RiaDefines::ResultCatType::STATIC_NATIVE, "PORV", 0 );
+    const std::vector<double>* porvResults = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
+                                                                            RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                            RiaResultNames::porv(),
+                                                                            0 );
     if ( !porvResults )
     {
         return;

ApplicationLibCode/ReservoirDataModel/Well/RigWellTargetMapping.cpp

@@ -634,7 +634,7 @@ std::vector<double> RigWellTargetMapping::loadOilVectorByName( RigCaseCellResult
         if ( volumesType == RigWellTargetMapping::VolumesType::RESERVOIR_VOLUMES_COMPUTED )
         {
             const std::vector<double>& porvResults =
-                resultsData.cellScalarResults( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORV" ), 0 );
+                resultsData.cellScalarResults( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::porv() ), 0 );
 
             for ( size_t i = 0; i < volume.size(); i++ )
             {
@@ -685,7 +685,7 @@ std::vector<double> RigWellTargetMapping::loadGasVectorByName( RigCaseCellResult
         if ( volumesType == RigWellTargetMapping::VolumesType::RESERVOIR_VOLUMES_COMPUTED )
         {
             const std::vector<double>& porvResults =
-                resultsData.cellScalarResults( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORV" ), 0 );
+                resultsData.cellScalarResults( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::porv() ), 0 );
 
             for ( size_t i = 0; i < volume.size(); i++ )
             {
@@ -777,7 +777,7 @@ std::vector<RigWellTargetMapping::ClusterStatistics> RigWellTargetMapping::gener
     auto resultsData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
     if ( !resultsData ) return statistics;
 
-    RigEclipseResultAddress porvAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORV" );
+    RigEclipseResultAddress porvAddress( RiaDefines::ResultCatType::STATIC_NATIVE, RiaResultNames::porv() );
     resultsData->ensureKnownResultLoaded( porvAddress );
     const std::vector<double>& porv = resultsData->cellScalarResults( porvAddress, 0 );
 

ApplicationLibCode/UnitTests/Intersect-Test.cpp

@@ -1,5 +1,7 @@
 #include "gtest/gtest.h"
 
+#include "RiaResultNames.h"
+
 #include "RifEclipseOutputFileTools.h"
 
 #include <QString>
@@ -16,7 +18,7 @@ TEST( IntersectDataImport, DISABLED_TestImportPORV )
     QString baseFolder = "d:/Models/Statoil/IX_output_files/";
     QString filename   = baseFolder + "NORNE_IX2.INIT";
 
-    std::string porv_kw( "PORV" );
+    std::string porv_kw( RiaResultNames::porv().toStdString() );
 
     ecl_file_type* ecl_file = ecl_file_open( filename.toStdString().data(), ECL_FILE_CLOSE_STREAM );