From 28c77d4b67d75aec3c4e3f40275ca873ee5a3115 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 6 Nov 2019 10:54:42 +0100 Subject: [PATCH] #82 Import Ascii-data : Minor code adjustments --- .../FileInterface/RifEclipseInputPropertyLoader.cpp | 2 +- .../FileInterface/RifEclipseInputPropertyLoader.h | 2 +- ApplicationCode/ProjectDataModel/RimEclipseCase.cpp | 3 +++ ApplicationCode/ProjectDataModel/RimEclipseCase.h | 10 +++++----- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.cpp b/ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.cpp index ae378fda58..781a44eb89 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.cpp @@ -51,7 +51,7 @@ void RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( caf::ProgressInfo progInfo( static_cast( filenames.size() * inputPropCount ), "Reading Input properties" ); int i = 0; - for ( const QString filename : filenames ) + for ( const QString& filename : filenames ) { int progress = static_cast( i * inputPropCount ); progInfo.setProgressDescription( filename ); diff --git a/ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.h b/ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.h index e11f11cff3..88365b4cf1 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.h +++ b/ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.h @@ -43,6 +43,7 @@ public: static void loadAndSyncronizeInputProperties( RimEclipseInputPropertyCollection* inputPropertyCollection, RigEclipseCaseData* eclipseCaseData, const std::vector& filenames ); + static bool readInputPropertiesFromFiles( RimEclipseInputPropertyCollection* inputPropertyCollection, RigEclipseCaseData* eclipseCaseData, bool importFaults, @@ -51,7 +52,6 @@ public: private: // Hide constructor to prevent instantiation RifEclipseInputPropertyLoader(); - ~RifEclipseInputPropertyLoader(); static std::set extractKeywordsOnFile( const QString& filename, bool isExistingFile ); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index 3035dccaee..5d63b559b5 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -1003,6 +1003,9 @@ std::vector RimEclipseCase::timeStepDates() const return std::vector(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- bool RimEclipseCase::importAsciiInputProperties( const QStringList& fileNames ) { return false; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.h b/ApplicationCode/ProjectDataModel/RimEclipseCase.h index 5cfdda22f1..76f58702ea 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h @@ -37,18 +37,18 @@ class QString; -class RigEclipseCaseData; class RigCaseCellResultsData; +class RigEclipseCaseData; class RigGridBase; class RigMainGrid; +class RigVirtualPerforationTransmissibilities; class RimCaseCollection; -class RimIdenticalGridCaseGroup; -class RimReservoirCellResultsStorage; class RimEclipseContourMapView; class RimEclipseContourMapViewCollection; -class RimEclipseView; -class RigVirtualPerforationTransmissibilities; class RimEclipseInputPropertyCollection; +class RimEclipseView; +class RimIdenticalGridCaseGroup; +class RimReservoirCellResultsStorage; //================================================================================================== //