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

18
ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@@ -91,11 +91,11 @@ bool RimEclipseInputCase::openDataFileSet( const QStringList& fileNames )
if ( fileNames.contains( RiaDefines::mockModelBasicInputCase() ) )
{
cvf::ref<RifReaderInterface> readerInterface = this->createMockModel( fileNames[0] );
results( RiaDefines::MATRIX_MODEL )->setReaderInterface( readerInterface.p() );
results( RiaDefines::FRACTURE_MODEL )->setReaderInterface( readerInterface.p() );
results( RiaDefines::PorosityModelType::MATRIX_MODEL )->setReaderInterface( readerInterface.p() );
results( RiaDefines::PorosityModelType::FRACTURE_MODEL )->setReaderInterface( readerInterface.p() );
eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL )->computeDerivedData();
eclipseCaseData()->activeCellInfo( RiaDefines::FRACTURE_MODEL )->computeDerivedData();
eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL )->computeDerivedData();
eclipseCaseData()->activeCellInfo( RiaDefines::PorosityModelType::FRACTURE_MODEL )->computeDerivedData();
QFileInfo gridFileName( fileNames[0] );
QString caseName = gridFileName.completeBaseName();
@@ -210,8 +210,8 @@ bool RimEclipseInputCase::openEclipseGridFile()
CVF_ASSERT( this->eclipseCaseData() );
CVF_ASSERT( readerInterface.notNull() );
results( RiaDefines::MATRIX_MODEL )->setReaderInterface( readerInterface.p() );
results( RiaDefines::FRACTURE_MODEL )->setReaderInterface( readerInterface.p() );
results( RiaDefines::PorosityModelType::MATRIX_MODEL )->setReaderInterface( readerInterface.p() );
results( RiaDefines::PorosityModelType::FRACTURE_MODEL )->setReaderInterface( readerInterface.p() );
this->eclipseCaseData()->mainGrid()->setFlipAxis( m_flipXAxis, m_flipYAxis );
@@ -222,11 +222,11 @@ bool RimEclipseInputCase::openEclipseGridFile()
RiaApplication* app = RiaApplication::instance();
if ( app->preferences()->autocomputeDepthRelatedProperties )
{
results( RiaDefines::MATRIX_MODEL )->computeDepthRelatedResults();
results( RiaDefines::FRACTURE_MODEL )->computeDepthRelatedResults();
results( RiaDefines::PorosityModelType::MATRIX_MODEL )->computeDepthRelatedResults();
results( RiaDefines::PorosityModelType::FRACTURE_MODEL )->computeDepthRelatedResults();
}
results( RiaDefines::MATRIX_MODEL )->computeCellVolumes();
results( RiaDefines::PorosityModelType::MATRIX_MODEL )->computeCellVolumes();
return true;
}