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

#8143 GRDECL import : Refactor grid data and property import

Browse Source
This commit is contained in:
Magne Sjaastad
2021-10-13 11:23:59 +02:00
parent 488468723b
commit 04b19e3ad7
6 changed files with 287 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ApplicationLibCode/FileInterface/RifEclipseInputFileTools.h
View File

@@ -97,37 +97,17 @@ public:
const cvf::Vec3st& max = cvf::Vec3st::UNDEFINED,
const cvf::Vec3st& refinement = cvf::Vec3st( 1, 1, 1 ) );
// Returns map of assigned resultName and Eclipse Keyword.
static std::map<QString, QString> readProperties( const QString& fileName, RigEclipseCaseData* eclipseCase );
static bool readProperty( const QString& fileName,
RigEclipseCaseData* eclipseCase,
const QString& eclipseKeyWord,
const QString& resultName );
static bool importFaultsFromFile( RigEclipseCaseData* eclipseCase, const QString& fileName );
static void readFaultsInGridSection( const QString& fileName,
cvf::Collection<RigFault>* faults,
std::vector<QString>* filenamesWithFaults,
const QString& faultIncludeFileAbsolutePathPrefix );
static void readFaults( const QString& fileName,
const std::vector<RifKeywordAndFilePos>& fileKeywords,
cvf::Collection<RigFault>* faults );
static void parseAndReadFaults( const QString& fileName, cvf::Collection<RigFault>* faults );
static void readFaults( QFile& data, qint64 filePos, cvf::Collection<RigFault>* faults, bool* isEditKeywordDetected );
static void findKeywordsOnFile( const QString& fileName, std::vector<RifKeywordAndFilePos>* keywords );
static void parseAndReadPathAliasKeyword( const QString& fileName,
std::vector<std::pair<QString, QString>>* pathAliasDefinitions );
static bool
readFaultsAndParseIncludeStatementsRecursively( QFile& file,
qint64 startPos,
const std::vector<std::pair<QString, QString>>& pathAliasDefinitions,
cvf::Collection<RigFault>* faults,
std::vector<QString>* filenamesWithFaults,
bool* isEditKeywordDetected,
const QString& faultIncludeFileAbsolutePathPrefix );
static bool readKeywordAndParseIncludeStatementsRecursively(
const QString& keyword,
const QString& keywordToStopParsing,
@@ -141,12 +121,27 @@ public:
// includeStatementAbsolutePathPrefix
);
static void readKeywordDataContent( QFile& data, qint64 filePos, QStringList* textContent, bool* isEditKeywordDetected );
static RiaDefines::EclipseUnitSystem readUnitSystem( QFile& file, qint64 gridunitPos );
static cvf::StructGridInterface::FaceEnum faceEnumFromText( const QString& faceString );
private:
static void readFaults( QFile& data, qint64 filePos, cvf::Collection<RigFault>* faults, bool* isEditKeywordDetected );
static void readFaults( const QString& fileName,
const std::vector<RifKeywordAndFilePos>& fileKeywords,
cvf::Collection<RigFault>* faults );
static bool
readFaultsAndParseIncludeStatementsRecursively( QFile& file,
qint64 startPos,
const std::vector<std::pair<QString, QString>>& pathAliasDefinitions,
cvf::Collection<RigFault>* faults,
std::vector<QString>* filenamesWithFaults,
bool* isEditKeywordDetected,
const QString& faultIncludeFileAbsolutePathPrefix );
static void readKeywordDataContent( QFile& data, qint64 filePos, QStringList* textContent, bool* isEditKeywordDetected );
static bool readDataFromKeyword( ecl_kw_type* eclipseKeywordData,
RigEclipseCaseData* caseData,
const QString& resultName,
@@ -162,7 +157,6 @@ private:
static size_t findFaultByName( const cvf::Collection<RigFault>& faults, const QString& name );
static qint64 findKeyword( const QString& keyword, QFile& file, qint64 startPos );
static bool isValidDataKeyword( const QString& keyword );
static void writeFaultLine( QTextStream& stream,
QString faultName,
@@ -173,7 +167,4 @@ private:
cvf::StructGridInterface::FaceType faceType );
static QString faultFaceText( cvf::StructGridInterface::FaceType faceType );
private:
static const std::vector<QString>& invalidPropertyDataKeywords();
};