OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Janitor : Readability improvements

Browse Source
This commit is contained in:
Magne Sjaastad
2021-10-14 19:50:29 +02:00
parent 0c5cf5e763
commit db45b47121
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp
+8 -8
View File
@@ -124,8 +124,8 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile( const QStringList&
{ {
RimSummaryCase* existingSummaryCase = RimSummaryCase* existingSummaryCase =
sumCaseColl->findSummaryCaseFromFileName( newSumCase->summaryHeaderFilename() ); sumCaseColl->findSummaryCaseFromFileName( newSumCase->summaryHeaderFilename() );
RimGridSummaryCase* existingGridSummaryCase = dynamic_cast<RimGridSummaryCase*>( existingSummaryCase ); auto* existingGridSummaryCase = dynamic_cast<RimGridSummaryCase*>( existingSummaryCase );
RimFileSummaryCase* existingFileSummaryCase = dynamic_cast<RimFileSummaryCase*>( existingSummaryCase ); auto* existingFileSummaryCase = dynamic_cast<RimFileSummaryCase*>( existingSummaryCase );
if ( existingGridSummaryCase ) if ( existingGridSummaryCase )
{ {
delete newSumCase; // No need to add anything new. Already have one. delete newSumCase; // No need to add anything new. Already have one.
@@ -260,7 +260,7 @@ bool RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilter( const QString
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
int RiaImportEclipseCaseTools::openEclipseInputCaseFromFileNames( const QStringList& fileNames, bool createDefaultView ) int RiaImportEclipseCaseTools::openEclipseInputCaseFromFileNames( const QStringList& fileNames, bool createDefaultView )
{ {
RimEclipseInputCase* rimInputReservoir = new RimEclipseInputCase(); auto* rimInputReservoir = new RimEclipseInputCase();
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
RimProject* project = app->project(); RimProject* project = app->project();
@@ -326,7 +326,7 @@ int RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl( const QStr
QFileInfo gridFileName( fileName ); QFileInfo gridFileName( fileName );
QString caseName = gridFileName.completeBaseName(); QString caseName = gridFileName.completeBaseName();
RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase(); auto* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo( caseName, fileName ); rimResultReservoir->setCaseInfo( caseName, fileName );
rimResultReservoir->setReaderSettings( readerSettings ); rimResultReservoir->setReaderSettings( readerSettings );
@@ -393,7 +393,7 @@ int RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl( const QStr
bool RiaImportEclipseCaseTools::addEclipseCases( const QStringList& fileNames, bool RiaImportEclipseCaseTools::addEclipseCases( const QStringList& fileNames,
RimIdenticalGridCaseGroup** resultingCaseGroup /*=nullptr*/ ) RimIdenticalGridCaseGroup** resultingCaseGroup /*=nullptr*/ )
{ {
if ( fileNames.size() == 0 ) return true; if ( fileNames.empty() ) return true;
// First file is read completely including grid. // First file is read completely including grid.
// The main grid from the first case is reused directly in for the other cases. // The main grid from the first case is reused directly in for the other cases.
@@ -411,7 +411,7 @@ bool RiaImportEclipseCaseTools::addEclipseCases( const QStringList& fil
QString caseName = gridFileName.completeBaseName(); QString caseName = gridFileName.completeBaseName();
RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase(); auto* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo( caseName, firstFileName ); rimResultReservoir->setCaseInfo( caseName, firstFileName );
if ( !rimResultReservoir->openEclipseGridFile() ) if ( !rimResultReservoir->openEclipseGridFile() )
{ {
@@ -439,7 +439,7 @@ bool RiaImportEclipseCaseTools::addEclipseCases( const QStringList& fil
QString caseName = gridFileName.completeBaseName(); QString caseName = gridFileName.completeBaseName();
RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase(); auto* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo( caseName, caseFileName ); rimResultReservoir->setCaseInfo( caseName, caseFileName );
std::vector<std::vector<int>> caseGridDimensions; std::vector<std::vector<int>> caseGridDimensions;
@@ -482,7 +482,7 @@ bool RiaImportEclipseCaseTools::addEclipseCases( const QStringList& fil
project->activeOilField()->analysisModels()->updateConnectedEditors(); project->activeOilField()->analysisModels()->updateConnectedEditors();
if ( RiaGuiApplication::isRunning() && gridCaseGroup && gridCaseGroup->statisticsCaseCollection()->reservoirs.size() > 0 ) if ( RiaGuiApplication::isRunning() && gridCaseGroup && !gridCaseGroup->statisticsCaseCollection()->reservoirs.empty() )
{ {
RiuMainWindow::instance()->selectAsCurrentItem( gridCaseGroup->statisticsCaseCollection()->reservoirs[0] ); RiuMainWindow::instance()->selectAsCurrentItem( gridCaseGroup->statisticsCaseCollection()->reservoirs[0] );
} }