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-23 23:25:22 +02:00
parent 8aa36ee31e
commit 3f88fe197a
56 changed files with 696 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@@ -164,7 +164,7 @@ void RimGridCrossPlotDataSet::setCellFilterView( RimGridView* cellFilterView )
{
m_xAxisProperty->setResultType( resAddr.m_resultCatType );
m_xAxisProperty->setResultVariable( resAddr.m_resultName );
m_yAxisProperty->setResultType( RiaDefines::STATIC_NATIVE );
m_yAxisProperty->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE );
m_yAxisProperty->setResultVariable( "DEPTH" );
m_timeStep = eclipseView->currentTimeStep();
m_grouping = NO_GROUPING;
@@ -1183,11 +1183,11 @@ void RimGridCrossPlotDataSet::configureForPressureSaturationCurves( RimEclipseRe
m_case = eclipseCase;
m_xAxisProperty->setEclipseCase( eclipseCase );
m_xAxisProperty->setResultType( RiaDefines::DYNAMIC_NATIVE );
m_xAxisProperty->setResultType( RiaDefines::ResultCatType::DYNAMIC_NATIVE );
m_xAxisProperty->setResultVariable( dynamicResultName );
m_yAxisProperty->setEclipseCase( eclipseCase );
m_yAxisProperty->setResultType( RiaDefines::STATIC_NATIVE );
m_yAxisProperty->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE );
m_yAxisProperty->setResultVariable( "DEPTH" );
m_grouping = NO_GROUPING;
@@ -1298,10 +1298,10 @@ void RimGridCrossPlotDataSet::setDefaults()
m_yAxisProperty->setEclipseCase( eclipseCase );
m_groupingProperty->setEclipseCase( eclipseCase );
m_xAxisProperty->setResultType( RiaDefines::STATIC_NATIVE );
m_xAxisProperty->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE );
m_xAxisProperty->setResultVariable( "PORO" );
m_yAxisProperty->setResultType( RiaDefines::STATIC_NATIVE );
m_yAxisProperty->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE );
m_yAxisProperty->setResultVariable( "PERMX" );
m_grouping = NO_GROUPING;

10
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp
View File

@@ -105,7 +105,7 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion( RiaDefines::Poro
RigCaseCellResultsData* caseCellResultsData = eclipseResultCase->eclipseCaseData()->results( porosityModel );
if ( caseCellResultsData )
{
RigEclipseResultAddress depthResultAddress( RiaDefines::STATIC_NATIVE, "DEPTH" );
RigEclipseResultAddress depthResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DEPTH" );
double minDepth = 0.0;
double maxDepth = 0.0;
@@ -136,7 +136,7 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion( RiaDefines::Poro
{
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase( eclipseResultCase );
resultDefinition->setResultType( RiaDefines::STATIC_NATIVE );
resultDefinition->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE );
resultDefinition->setResultVariable( RiaDefines::eqlnumResultName() );
cellFilter->setResultDefinition( resultDefinition );
@@ -151,7 +151,7 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion( RiaDefines::Poro
RigCaseCellResultsData* caseCellResultsData = eclipseResultCase->eclipseCaseData()->results( porosityModel );
if ( caseCellResultsData )
{
RigEclipseResultAddress depthResultAddress( RiaDefines::STATIC_NATIVE, "DEPTH" );
RigEclipseResultAddress depthResultAddress( RiaDefines::ResultCatType::STATIC_NATIVE, "DEPTH" );
double minDepth = 0.0;
double maxDepth = 0.0;
@@ -244,7 +244,7 @@ RimPlotCellPropertyFilter*
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase( eclipseResultCase );
resultDefinition->setResultType( RiaDefines::STATIC_NATIVE );
resultDefinition->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE );
resultDefinition->setResultVariable( RiaDefines::eqlnumResultName() );
cellFilter->setResultDefinition( resultDefinition );
@@ -265,7 +265,7 @@ RimPlotCellPropertyFilter* RimSaturationPressurePlot::createDepthPropertyFilter(
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase( eclipseResultCase );
resultDefinition->setResultType( RiaDefines::STATIC_NATIVE );
resultDefinition->setResultType( RiaDefines::ResultCatType::STATIC_NATIVE );
resultDefinition->setResultVariable( "DEPTH" );
depthCellFilter->setResultDefinition( resultDefinition );

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp
View File

@@ -67,7 +67,7 @@ std::vector<RimSaturationPressurePlot*>
std::set<int> eqlnumRegionIdsFound;
{
RigEclipseResultAddress resAdr( RiaDefines::STATIC_NATIVE, RiaDefines::eqlnumResultName() );
RigEclipseResultAddress resAdr( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::eqlnumResultName() );
if ( results->hasResultEntry( resAdr ) )
{
results->ensureKnownResultLoaded( resAdr );