OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-09 23:53:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

#82 Import Ascii-data : Minor code adjustments

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.cpp
View File

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

2
ApplicationCode/FileInterface/RifEclipseInputPropertyLoader.h
View File

@ -43,6 +43,7 @@ public:
static void loadAndSyncronizeInputProperties( RimEclipseInputPropertyCollection* inputPropertyCollection,
RigEclipseCaseData* eclipseCaseData,
const std::vector<QString>& 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<QString> extractKeywordsOnFile( const QString& filename, bool isExistingFile );

3
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

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

10
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@ -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;
//==================================================================================================
//