mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Convert to enum class
This commit is contained in:
@@ -150,7 +150,7 @@ void RigEclipseToStimPlanCellTransmissibilityCalculator::calculateStimPlanCellsM
|
||||
|
||||
const RigEclipseCaseData* eclipseCaseData = m_case->eclipseCaseData();
|
||||
|
||||
RiaDefines::PorosityModelType porosityModel = RiaDefines::MATRIX_MODEL;
|
||||
RiaDefines::PorosityModelType porosityModel = RiaDefines::PorosityModelType::MATRIX_MODEL;
|
||||
|
||||
cvf::ref<RigResultAccessor> dataAccessObjectDx = createResultAccessor( m_case, "DX" );
|
||||
cvf::ref<RigResultAccessor> dataAccessObjectDy = createResultAccessor( m_case, "DY" );
|
||||
@@ -380,7 +380,7 @@ cvf::ref<RigResultAccessor>
|
||||
RigEclipseToStimPlanCellTransmissibilityCalculator::createResultAccessor( const RimEclipseCase* eclipseCase,
|
||||
const QString& uiResultName )
|
||||
{
|
||||
RiaDefines::PorosityModelType porosityModel = RiaDefines::MATRIX_MODEL;
|
||||
RiaDefines::PorosityModelType porosityModel = RiaDefines::PorosityModelType::MATRIX_MODEL;
|
||||
const RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();
|
||||
|
||||
// Create result accessor object for main grid at time step zero (static result date is always at first time step
|
||||
|
||||
@@ -47,8 +47,8 @@ RigEclipseCaseData::RigEclipseCaseData( RimEclipseCase* ownerCase )
|
||||
m_mainGrid = new RigMainGrid();
|
||||
m_ownerCase = ownerCase;
|
||||
|
||||
m_matrixModelResults = new RigCaseCellResultsData( this, RiaDefines::MATRIX_MODEL );
|
||||
m_fractureModelResults = new RigCaseCellResultsData( this, RiaDefines::FRACTURE_MODEL );
|
||||
m_matrixModelResults = new RigCaseCellResultsData( this, RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
m_fractureModelResults = new RigCaseCellResultsData( this, RiaDefines::PorosityModelType::FRACTURE_MODEL );
|
||||
|
||||
m_activeCellInfo = new RigActiveCellInfo;
|
||||
m_fractureActiveCellInfo = new RigActiveCellInfo;
|
||||
@@ -592,7 +592,7 @@ void RigEclipseCaseData::setEquilData( const std::vector<RigEquil>& equilObjects
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RigActiveCellInfo* RigEclipseCaseData::activeCellInfo( RiaDefines::PorosityModelType porosityModel )
|
||||
{
|
||||
if ( porosityModel == RiaDefines::MATRIX_MODEL )
|
||||
if ( porosityModel == RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
{
|
||||
return m_activeCellInfo.p();
|
||||
}
|
||||
@@ -605,7 +605,7 @@ RigActiveCellInfo* RigEclipseCaseData::activeCellInfo( RiaDefines::PorosityModel
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
const RigActiveCellInfo* RigEclipseCaseData::activeCellInfo( RiaDefines::PorosityModelType porosityModel ) const
|
||||
{
|
||||
if ( porosityModel == RiaDefines::MATRIX_MODEL )
|
||||
if ( porosityModel == RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
{
|
||||
return m_activeCellInfo.p();
|
||||
}
|
||||
@@ -618,7 +618,7 @@ const RigActiveCellInfo* RigEclipseCaseData::activeCellInfo( RiaDefines::Porosit
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigEclipseCaseData::setActiveCellInfo( RiaDefines::PorosityModelType porosityModel, RigActiveCellInfo* activeCellInfo )
|
||||
{
|
||||
if ( porosityModel == RiaDefines::MATRIX_MODEL )
|
||||
if ( porosityModel == RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
{
|
||||
m_activeCellInfo = activeCellInfo;
|
||||
m_matrixModelResults->setActiveCellInfo( m_activeCellInfo.p() );
|
||||
@@ -635,8 +635,8 @@ void RigEclipseCaseData::setActiveCellInfo( RiaDefines::PorosityModelType porosi
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RigEclipseCaseData::hasFractureResults() const
|
||||
{
|
||||
if ( activeCellInfo( RiaDefines::FRACTURE_MODEL ) &&
|
||||
activeCellInfo( RiaDefines::FRACTURE_MODEL )->reservoirActiveCellCount() > 0 )
|
||||
if ( activeCellInfo( RiaDefines::PorosityModelType::FRACTURE_MODEL ) &&
|
||||
activeCellInfo( RiaDefines::PorosityModelType::FRACTURE_MODEL )->reservoirActiveCellCount() > 0 )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -738,7 +738,7 @@ RigAllenDiagramData* RigEclipseCaseData::allenDiagramData()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RigCaseCellResultsData* RigEclipseCaseData::results( RiaDefines::PorosityModelType porosityModel )
|
||||
{
|
||||
if ( porosityModel == RiaDefines::MATRIX_MODEL )
|
||||
if ( porosityModel == RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
{
|
||||
return m_matrixModelResults.p();
|
||||
}
|
||||
@@ -751,7 +751,7 @@ RigCaseCellResultsData* RigEclipseCaseData::results( RiaDefines::PorosityModelTy
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
const RigCaseCellResultsData* RigEclipseCaseData::results( RiaDefines::PorosityModelType porosityModel ) const
|
||||
{
|
||||
if ( porosityModel == RiaDefines::MATRIX_MODEL )
|
||||
if ( porosityModel == RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
{
|
||||
return m_matrixModelResults.p();
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ RigEclipseCrossPlotResult RigEclipseCrossPlotDataExtractor::extract( RigEclipseC
|
||||
{
|
||||
RigEclipseCrossPlotResult result;
|
||||
|
||||
RigCaseCellResultsData* resultData = caseData->results( RiaDefines::MATRIX_MODEL );
|
||||
RigCaseCellResultsData* resultData = caseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
if ( !resultData ) return result;
|
||||
|
||||
const std::vector<std::vector<double>>* catValuesForAllSteps = nullptr;
|
||||
|
||||
@@ -84,7 +84,8 @@ const RigActiveCellInfo* RigFlowDiagResults::activeCellInfo( const RigFlowDiagRe
|
||||
RimEclipseResultCase* eclCase;
|
||||
m_flowDiagSolution->firstAncestorOrThisOfType( eclCase );
|
||||
|
||||
return eclCase->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL ); // Todo: base on resVarAddr member
|
||||
return eclCase->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL ); // Todo: base on
|
||||
// resVarAddr member
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -231,8 +231,9 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate( size_t
|
||||
{
|
||||
using namespace Opm::FlowDiagnostics;
|
||||
|
||||
RigFlowDiagTimeStepResult result(
|
||||
m_eclipseCase->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL )->reservoirActiveCellCount() );
|
||||
RigFlowDiagTimeStepResult result( m_eclipseCase->eclipseCaseData()
|
||||
->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
->reservoirActiveCellCount() );
|
||||
|
||||
caf::ProgressInfo progressInfo( 8, "Calculating Flow Diagnostics" );
|
||||
|
||||
@@ -282,7 +283,7 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate( size_t
|
||||
|
||||
size_t restartFileCount = static_cast<size_t>( restartFileNames.size() );
|
||||
size_t maxTimeStepCount =
|
||||
m_eclipseCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->maxTimeStepCount();
|
||||
m_eclipseCase->eclipseCaseData()->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->maxTimeStepCount();
|
||||
|
||||
if ( restartFileCount <= timeStepIndex && restartFileCount != maxTimeStepCount )
|
||||
{
|
||||
@@ -329,10 +330,12 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate( size_t
|
||||
CVF_ASSERT( currentRestartData );
|
||||
|
||||
RigEclipseResultAddress addrToMaxTimeStepCountResult;
|
||||
m_eclipseCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->maxTimeStepCount( &addrToMaxTimeStepCountResult );
|
||||
m_eclipseCase->eclipseCaseData()
|
||||
->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
->maxTimeStepCount( &addrToMaxTimeStepCountResult );
|
||||
|
||||
int reportStepNumber = m_eclipseCase->eclipseCaseData()
|
||||
->results( RiaDefines::MATRIX_MODEL )
|
||||
->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
->reportStepNumber( addrToMaxTimeStepCountResult, timeStepIndex );
|
||||
|
||||
if ( !currentRestartData->selectReportStep( reportStepNumber ) )
|
||||
@@ -349,7 +352,7 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate( size_t
|
||||
|
||||
try
|
||||
{
|
||||
if ( m_eclipseCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->hasFlowDiagUsableFluxes() )
|
||||
if ( m_eclipseCase->eclipseCaseData()->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->hasFlowDiagUsableFluxes() )
|
||||
{
|
||||
Opm::FlowDiagnostics::ConnectionValues connectionsVals =
|
||||
RigFlowDiagInterfaceTools::extractFluxFieldFromRestartFile( *( m_opmFlowDiagStaticData->m_eclGraph ),
|
||||
@@ -528,7 +531,7 @@ bool RigFlowDiagSolverInterface::ensureStaticDataObjectInstanceCreated()
|
||||
return false;
|
||||
}
|
||||
|
||||
auto fileReader = eclipseCaseData->results( RiaDefines::MATRIX_MODEL )->readerInterface();
|
||||
auto fileReader = eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->readerInterface();
|
||||
auto eclOutput = dynamic_cast<const RifReaderEclipseOutput*>( fileReader );
|
||||
if ( eclOutput )
|
||||
{
|
||||
@@ -562,19 +565,19 @@ void RigFlowDiagSolverInterface::assignPhaseCorrecedPORV( RigFlowDiagResultAddre
|
||||
switch ( phaseSelection )
|
||||
{
|
||||
case RigFlowDiagResultAddress::PHASE_OIL:
|
||||
phaseSaturation = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
|
||||
phaseSaturation = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::DYNAMIC_NATIVE,
|
||||
"SOIL",
|
||||
timeStepIdx );
|
||||
break;
|
||||
case RigFlowDiagResultAddress::PHASE_GAS:
|
||||
phaseSaturation = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
|
||||
phaseSaturation = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::DYNAMIC_NATIVE,
|
||||
"SGAS",
|
||||
timeStepIdx );
|
||||
break;
|
||||
case RigFlowDiagResultAddress::PHASE_WAT:
|
||||
phaseSaturation = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
|
||||
phaseSaturation = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::DYNAMIC_NATIVE,
|
||||
"SWAT",
|
||||
timeStepIdx );
|
||||
|
||||
@@ -118,7 +118,7 @@ void RigFlowDiagStatCalc::mobileVolumeWeightedMean( size_t timeStepIndex, double
|
||||
m_resultsData->flowDiagSolution()->firstAncestorOrThisOfType( eclCase );
|
||||
if ( !eclCase ) return;
|
||||
|
||||
RigCaseCellResultsData* caseCellResultsData = eclCase->results( RiaDefines::MATRIX_MODEL );
|
||||
RigCaseCellResultsData* caseCellResultsData = eclCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
RigEclipseResultAddress mobPoreVolResAddr( RiaDefines::ResultCatType::STATIC_NATIVE,
|
||||
RiaDefines::mobilePoreVolumeName() );
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@ void RigFlowDiagVisibleCellsStatCalc::mobileVolumeWeightedMean( size_t timeStepI
|
||||
m_resultsData->flowDiagSolution()->firstAncestorOrThisOfType( eclCase );
|
||||
if ( !eclCase ) return;
|
||||
|
||||
RigCaseCellResultsData* caseCellResultsData = eclCase->results( RiaDefines::MATRIX_MODEL );
|
||||
RigCaseCellResultsData* caseCellResultsData = eclCase->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
|
||||
RigEclipseResultAddress mobPorvAddr( RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::mobilePoreVolumeName() );
|
||||
|
||||
|
||||
@@ -42,13 +42,15 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
|
||||
RigMainGrid* mainGrid = caseToApply->eclipseCaseData()->mainGrid();
|
||||
|
||||
RigEclipseCaseData* eclipseCaseData = caseToApply->eclipseCaseData();
|
||||
RigCaseCellResultsData* gridCellResults = caseToApply->results( RiaDefines::MATRIX_MODEL );
|
||||
RigCaseCellResultsData* gridCellResults = caseToApply->results( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
|
||||
RigActiveCellInfo* actCellInfo = caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL );
|
||||
size_t resultCellCount = actCellInfo->reservoirCellResultCount();
|
||||
RigActiveCellInfo* actCellInfo =
|
||||
caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
size_t resultCellCount = actCellInfo->reservoirCellResultCount();
|
||||
|
||||
size_t timeStepCount = caseToApply->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->maxTimeStepCount();
|
||||
size_t totalProgress = tracerNames.size() + 8 + timeStepCount + 2 * timeStepCount;
|
||||
size_t timeStepCount =
|
||||
caseToApply->eclipseCaseData()->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->maxTimeStepCount();
|
||||
size_t totalProgress = tracerNames.size() + 8 + timeStepCount + 2 * timeStepCount;
|
||||
caf::ProgressInfo progress( totalProgress, "Calculating number of flooded mobile pore volumes." );
|
||||
progress.setProgressDescription( "Loading required results" );
|
||||
// PORV
|
||||
@@ -110,7 +112,7 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
|
||||
progress.incrementProgress();
|
||||
|
||||
std::vector<double> daysSinceSimulationStart =
|
||||
caseToApply->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->daysSinceSimulationStart();
|
||||
caseToApply->eclipseCaseData()->results( RiaDefines::PorosityModelType::MATRIX_MODEL )->daysSinceSimulationStart();
|
||||
|
||||
progress.incrementProgress();
|
||||
|
||||
@@ -119,24 +121,24 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
|
||||
const std::vector<double>* flowrateI = nullptr;
|
||||
if ( hasFlowrateI )
|
||||
{
|
||||
flowrateI =
|
||||
&( eclipseCaseData->results( RiaDefines::MATRIX_MODEL )->cellScalarResults( flrWatIAddr, timeStep ) );
|
||||
flowrateI = &( eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
->cellScalarResults( flrWatIAddr, timeStep ) );
|
||||
}
|
||||
flowrateIatAllTimeSteps.push_back( flowrateI );
|
||||
|
||||
const std::vector<double>* flowrateJ = nullptr;
|
||||
if ( hasFlowrateJ )
|
||||
{
|
||||
flowrateJ =
|
||||
&( eclipseCaseData->results( RiaDefines::MATRIX_MODEL )->cellScalarResults( flrWatJAddr, timeStep ) );
|
||||
flowrateJ = &( eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
->cellScalarResults( flrWatJAddr, timeStep ) );
|
||||
}
|
||||
flowrateJatAllTimeSteps.push_back( flowrateJ );
|
||||
|
||||
const std::vector<double>* flowrateK = nullptr;
|
||||
if ( hasFlowrateK )
|
||||
{
|
||||
flowrateK =
|
||||
&( eclipseCaseData->results( RiaDefines::MATRIX_MODEL )->cellScalarResults( flrWatKAddr, timeStep ) );
|
||||
flowrateK = &( eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
->cellScalarResults( flrWatKAddr, timeStep ) );
|
||||
}
|
||||
flowrateKatAllTimeSteps.push_back( flowrateK );
|
||||
|
||||
@@ -150,7 +152,8 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
|
||||
for ( const RigEclipseResultAddress& tracerResAddr : tracerResAddrs )
|
||||
{
|
||||
const std::vector<double>* tracerResult =
|
||||
&( eclipseCaseData->results( RiaDefines::MATRIX_MODEL )->cellScalarResults( tracerResAddr, timeStep ) );
|
||||
&( eclipseCaseData->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
|
||||
->cellScalarResults( tracerResAddr, timeStep ) );
|
||||
|
||||
for ( size_t i = 0; i < summedTracerValues.size(); i++ )
|
||||
{
|
||||
@@ -202,8 +205,9 @@ void RigNumberOfFloodedPoreVolumesCalculator::calculate( RigMainGrid*
|
||||
std::vector<std::vector<double>> summedTracersAtAllTimesteps )
|
||||
{
|
||||
// size_t totalNumberOfCells = mainGrid->globalCellArray().size();
|
||||
RigActiveCellInfo* actCellInfo = caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL );
|
||||
size_t resultCellCount = actCellInfo->reservoirCellResultCount();
|
||||
RigActiveCellInfo* actCellInfo =
|
||||
caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
size_t resultCellCount = actCellInfo->reservoirCellResultCount();
|
||||
|
||||
caf::ProgressInfo progress( 2 * daysSinceSimulationStart.size(), "" );
|
||||
|
||||
@@ -296,7 +300,8 @@ void RigNumberOfFloodedPoreVolumesCalculator::distributeNNCflow( const std::vect
|
||||
const std::vector<double>* flowrateNNC,
|
||||
std::vector<double>& flowrateIntoCell )
|
||||
{
|
||||
RigActiveCellInfo* actCellInfo = caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL );
|
||||
RigActiveCellInfo* actCellInfo =
|
||||
caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
|
||||
// Find max count for connections with result. Allen results introduce connections without results
|
||||
size_t connectionsWithResultCount = std::min( flowrateNNC->size(), connections.size() );
|
||||
@@ -336,7 +341,8 @@ void RigNumberOfFloodedPoreVolumesCalculator::distributeNeighbourCellFlow( RigMa
|
||||
const std::vector<double>* flrWatResultK,
|
||||
std::vector<double>& totalFlowrateIntoCell )
|
||||
{
|
||||
RigActiveCellInfo* actCellInfo = caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL );
|
||||
RigActiveCellInfo* actCellInfo =
|
||||
caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
|
||||
for ( size_t globalCellIndex = 0; globalCellIndex < mainGrid->globalCellArray().size(); globalCellIndex++ )
|
||||
{
|
||||
|
||||
@@ -261,7 +261,7 @@ void RigReservoirBuilderMock::populateReservoir( RigEclipseCaseData* eclipseCase
|
||||
addFaults( eclipseCase );
|
||||
|
||||
// Set all cells active
|
||||
RigActiveCellInfo* activeCellInfo = eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL );
|
||||
RigActiveCellInfo* activeCellInfo = eclipseCase->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
|
||||
activeCellInfo->setReservoirCellCount( eclipseCase->mainGrid()->globalCellArray().size() );
|
||||
for ( size_t i = 0; i < eclipseCase->mainGrid()->globalCellArray().size(); i++ )
|
||||
{
|
||||
|
||||
@@ -44,14 +44,22 @@ RigTofAccumulatedPhaseFractionsCalculator::RigTofAccumulatedPhaseFractionsCalcul
|
||||
RigEclipseCaseData* eclipseCaseData = caseToApply->eclipseCaseData();
|
||||
if ( !eclipseCaseData ) return;
|
||||
|
||||
const std::vector<double>* swatResults =
|
||||
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::ResultCatType::DYNAMIC_NATIVE, "SWAT", timestep );
|
||||
const std::vector<double>* soilResults =
|
||||
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::ResultCatType::DYNAMIC_NATIVE, "SOIL", timestep );
|
||||
const std::vector<double>* sgasResults =
|
||||
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::ResultCatType::DYNAMIC_NATIVE, "SGAS", timestep );
|
||||
const std::vector<double>* porvResults =
|
||||
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::ResultCatType::STATIC_NATIVE, "PORV", 0 );
|
||||
const std::vector<double>* swatResults = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::DYNAMIC_NATIVE,
|
||||
"SWAT",
|
||||
timestep );
|
||||
const std::vector<double>* soilResults = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::DYNAMIC_NATIVE,
|
||||
"SOIL",
|
||||
timestep );
|
||||
const std::vector<double>* sgasResults = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::DYNAMIC_NATIVE,
|
||||
"SGAS",
|
||||
timestep );
|
||||
const std::vector<double>* porvResults = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::STATIC_NATIVE,
|
||||
"PORV",
|
||||
0 );
|
||||
|
||||
RimFlowDiagSolution* flowDiagSolution = caseToApply->defaultFlowDiagSolution();
|
||||
|
||||
|
||||
@@ -60,8 +60,10 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator( RimEclipseRe
|
||||
RigFlowDiagResults* flowDiagResults = flowDiagSolution->flowDiagResults();
|
||||
CVF_ASSERT( flowDiagResults );
|
||||
|
||||
const std::vector<double>* porvResults =
|
||||
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::ResultCatType::STATIC_NATIVE, "PORV", 0 );
|
||||
const std::vector<double>* porvResults = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::STATIC_NATIVE,
|
||||
"PORV",
|
||||
0 );
|
||||
if ( !porvResults )
|
||||
{
|
||||
return;
|
||||
@@ -74,7 +76,7 @@ RigTofWellDistributionCalculator::RigTofWellDistributionCalculator( RimEclipseRe
|
||||
phaseResultName = "SOIL";
|
||||
else if ( phase == RiaDefines::GAS_PHASE )
|
||||
phaseResultName = "SGAS";
|
||||
const std::vector<double>* phaseResults = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
|
||||
const std::vector<double>* phaseResults = eclipseCaseData->resultValues( RiaDefines::PorosityModelType::MATRIX_MODEL,
|
||||
RiaDefines::ResultCatType::DYNAMIC_NATIVE,
|
||||
phaseResultName,
|
||||
timeStepIndex );
|
||||
|
||||
Reference in New Issue
Block a user