OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert to enum class

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-24 06:53:06 +02:00
parent 3f88fe197a
commit 83914006fd
64 changed files with 406 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

@@ -179,7 +179,7 @@ std::vector<double> RimEclipseContourMapProjection::generateResults( int timeSte
{
if ( !cellColors->isTernarySaturationSelected() )
{
RigCaseCellResultsData* resultData = eclipseCase->results( RiaDefines::MATRIX_MODEL );
RigCaseCellResultsData* resultData = eclipseCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
std::vector<double> gridResultValues;
if ( isColumnResult() )
{
@@ -260,7 +260,7 @@ void RimEclipseContourMapProjection::clearResultVariable()
//--------------------------------------------------------------------------------------------------
std::vector<double> RimEclipseContourMapProjection::calculateColumnResult( ResultAggregation resultAggregation ) const
{
const RigCaseCellResultsData* resultData = eclipseCase()->results( RiaDefines::MATRIX_MODEL );
const RigCaseCellResultsData* resultData = eclipseCase()->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
bool hasPoroResult =
resultData->hasResultEntry( RigEclipseResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "PORO" ) );
bool hasNtgResult =
@@ -476,7 +476,8 @@ double RimEclipseContourMapProjection::getParameterWeightForCell( size_t
//--------------------------------------------------------------------------------------------------
size_t RimEclipseContourMapProjection::gridResultIndex( size_t globalCellIdx ) const
{
const RigActiveCellInfo* activeCellInfo = eclipseCase()->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL );
const RigActiveCellInfo* activeCellInfo =
eclipseCase()->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
return activeCellInfo->cellResultIndex( globalCellIdx );
}