#82 Import Ascii-data : Minor code adjustments

This commit is contained in:
Magne Sjaastad
2019-11-06 10:54:42 +01:00
parent 309e4f9f31
commit 28c77d4b67
4 changed files with 10 additions and 7 deletions

View File

@@ -51,7 +51,7 @@ void RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties(
caf::ProgressInfo progInfo( static_cast<int>( filenames.size() * inputPropCount ), "Reading Input properties" ); caf::ProgressInfo progInfo( static_cast<int>( filenames.size() * inputPropCount ), "Reading Input properties" );
int i = 0; int i = 0;
for ( const QString filename : filenames ) for ( const QString& filename : filenames )
{ {
int progress = static_cast<int>( i * inputPropCount ); int progress = static_cast<int>( i * inputPropCount );
progInfo.setProgressDescription( filename ); progInfo.setProgressDescription( filename );

View File

@@ -43,6 +43,7 @@ public:
static void loadAndSyncronizeInputProperties( RimEclipseInputPropertyCollection* inputPropertyCollection, static void loadAndSyncronizeInputProperties( RimEclipseInputPropertyCollection* inputPropertyCollection,
RigEclipseCaseData* eclipseCaseData, RigEclipseCaseData* eclipseCaseData,
const std::vector<QString>& filenames ); const std::vector<QString>& filenames );
static bool readInputPropertiesFromFiles( RimEclipseInputPropertyCollection* inputPropertyCollection, static bool readInputPropertiesFromFiles( RimEclipseInputPropertyCollection* inputPropertyCollection,
RigEclipseCaseData* eclipseCaseData, RigEclipseCaseData* eclipseCaseData,
bool importFaults, bool importFaults,
@@ -51,7 +52,6 @@ public:
private: private:
// Hide constructor to prevent instantiation // Hide constructor to prevent instantiation
RifEclipseInputPropertyLoader(); RifEclipseInputPropertyLoader();
~RifEclipseInputPropertyLoader();
static std::set<QString> extractKeywordsOnFile( const QString& filename, bool isExistingFile ); static std::set<QString> extractKeywordsOnFile( const QString& filename, bool isExistingFile );

View File

@@ -1003,6 +1003,9 @@ std::vector<QDateTime> RimEclipseCase::timeStepDates() const
return std::vector<QDateTime>(); return std::vector<QDateTime>();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseCase::importAsciiInputProperties( const QStringList& fileNames ) bool RimEclipseCase::importAsciiInputProperties( const QStringList& fileNames )
{ {
return false; return false;

View File

@@ -37,18 +37,18 @@
class QString; class QString;
class RigEclipseCaseData;
class RigCaseCellResultsData; class RigCaseCellResultsData;
class RigEclipseCaseData;
class RigGridBase; class RigGridBase;
class RigMainGrid; class RigMainGrid;
class RigVirtualPerforationTransmissibilities;
class RimCaseCollection; class RimCaseCollection;
class RimIdenticalGridCaseGroup;
class RimReservoirCellResultsStorage;
class RimEclipseContourMapView; class RimEclipseContourMapView;
class RimEclipseContourMapViewCollection; class RimEclipseContourMapViewCollection;
class RimEclipseView;
class RigVirtualPerforationTransmissibilities;
class RimEclipseInputPropertyCollection; class RimEclipseInputPropertyCollection;
class RimEclipseView;
class RimIdenticalGridCaseGroup;
class RimReservoirCellResultsStorage;
//================================================================================================== //==================================================================================================
// //