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

#3194. Adapt ResInsight to modified ecllib API

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-08-13 10:44:15 +02:00
parent 23024b790f
commit 5081f12bb5
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -214,7 +214,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigEclipseC
ecl_grid_free(inputGrid); ecl_grid_free(inputGrid);
util_fclose(gridFilePointer); fclose(gridFilePointer);
return true; return true;
} }
@@ -264,7 +264,7 @@ std::map<QString, QString> RifEclipseInputFileTools::readProperties(const QStrin
progress.setProgress(i); progress.setProgress(i);
} }
util_fclose(gridFilePointer); fclose(gridFilePointer);
return newResults; return newResults;
} }
@@ -291,7 +291,7 @@ bool RifEclipseInputFileTools::readProperty(const QString& fileName, RigEclipseC
ecl_kw_free(eclipseKeywordData); ecl_kw_free(eclipseKeywordData);
} }
util_fclose(filePointer); fclose(filePointer);
return isOk; return isOk;
} }

16
ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp
View File

@@ -70,7 +70,7 @@ void RifEclipseSummaryTools::findSummaryFiles(const QString& inputFile,
if(myHeaderFile) if(myHeaderFile)
{ {
(*headerFile) = RiaStringEncodingTools::fromNativeEncoded(myHeaderFile); (*headerFile) = RiaStringEncodingTools::fromNativeEncoded(myHeaderFile);
util_safe_free(myHeaderFile); free(myHeaderFile);
} }
if(stringlist_get_size(summary_file_list) > 0) if(stringlist_get_size(summary_file_list) > 0)
@@ -124,7 +124,7 @@ QStringList RifEclipseSummaryTools::findSummaryDataFiles(const QString& caseFile
} }
} }
util_safe_free(header_file); free(header_file);
stringlist_free(summary_file_list); stringlist_free(summary_file_list);
return fileNames; return fileNames;
@@ -155,9 +155,9 @@ QString RifEclipseSummaryTools::findGridCaseFileFromSummaryHeaderFile(const QStr
if (caseFile) gridCaseFile = caseFile; if (caseFile) gridCaseFile = caseFile;
util_safe_free(caseFile); free(caseFile);
util_safe_free(myBase); free(myBase);
util_safe_free(myPath); free(myPath);
return RiaFilePathTools::toInternalSeparator(gridCaseFile); return RiaFilePathTools::toInternalSeparator(gridCaseFile);
} }
@@ -224,8 +224,8 @@ void RifEclipseSummaryTools::findSummaryHeaderFileInfo(const QString& inputFile,
if (myBase && base) *base = RiaFilePathTools::toInternalSeparator(myBase); if (myBase && base) *base = RiaFilePathTools::toInternalSeparator(myBase);
if (isFormatted) *isFormatted = formattedFile; if (isFormatted) *isFormatted = formattedFile;
util_safe_free(myHeaderFile); free(myHeaderFile);
util_safe_free(myBase); free(myBase);
util_safe_free(myPath); free(myPath);
} }

12
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -72,8 +72,13 @@ ecl_sum_type* openEclSum(const QString& inHeaderFileName, bool includeRestartFil
stringlist_append_copy(dataFiles, RiaStringEncodingTools::toNativeEncoded(dataFileNames[i]).data()); stringlist_append_copy(dataFiles, RiaStringEncodingTools::toNativeEncoded(dataFileNames[i]).data());
} }
bool lazyLoad = true;
std::string itemSeparatorInVariableNames = ":"; std::string itemSeparatorInVariableNames = ":";
ecl_sum_type* ecl_sum = ecl_sum_fread_alloc(RiaStringEncodingTools::toNativeEncoded(headerFileName).data(), dataFiles, itemSeparatorInVariableNames.data(), includeRestartFiles); ecl_sum_type* ecl_sum = ecl_sum_fread_alloc(RiaStringEncodingTools::toNativeEncoded(headerFileName).data(),
dataFiles,
itemSeparatorInVariableNames.data(),
includeRestartFiles,
lazyLoad);
stringlist_free(dataFiles); stringlist_free(dataFiles);
@@ -217,8 +222,7 @@ RifRestartFileInfo RifReaderEclipseSummary::getFileInfo(const QString& headerFil
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type * ertSumVarNode) RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type * ertSumVarNode)
{ {
if ( smspec_node_get_var_type(ertSumVarNode) == ECL_SMSPEC_INVALID_VAR if (smspec_node_get_var_type(ertSumVarNode) == ECL_SMSPEC_INVALID_VAR)
|| !smspec_node_is_valid(ertSumVarNode))
{ {
return RifEclipseSummaryAddress(); return RifEclipseSummaryAddress();
} }
@@ -483,7 +487,7 @@ RifRestartFileInfo RifReaderEclipseSummary::getRestartFile(const QString& header
char* smspec_header = ecl_util_alloc_exfilename(path.toStdString().data(), restartBase.toStdString().data(), ECL_SUMMARY_HEADER_FILE, false /*unformatted*/, 0); char* smspec_header = ecl_util_alloc_exfilename(path.toStdString().data(), restartBase.toStdString().data(), ECL_SUMMARY_HEADER_FILE, false /*unformatted*/, 0);
QString restartFileName = RiaFilePathTools::toInternalSeparator(RiaStringEncodingTools::fromNativeEncoded(smspec_header)); QString restartFileName = RiaFilePathTools::toInternalSeparator(RiaStringEncodingTools::fromNativeEncoded(smspec_header));
util_safe_free(smspec_header); free(smspec_header);
return getFileInfo(restartFileName); return getFileInfo(restartFileName);
} }