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

#3512 System : Remove unused functions

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-18 15:40:11 +02:00
parent 766fea603e
commit 726658d642
24 changed files with 26 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp
View File

@@ -85,38 +85,6 @@ void RifEclipseSummaryTools::findSummaryFiles(const QString& inputFile,
return;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RifEclipseSummaryTools::findSummaryDataFiles(const QString& caseFile)
{
QStringList fileNames;
QString path;
QString base;
findSummaryHeaderFileInfo(caseFile, nullptr, &path, &base, nullptr);
if (path.isEmpty() || base.isEmpty()) return fileNames;
char* header_file = nullptr;
stringlist_type* summary_file_list = stringlist_alloc_new();
ecl_util_alloc_summary_files(RiaStringEncodingTools::toNativeEncoded(path).data(), RiaStringEncodingTools::toNativeEncoded(base).data(), nullptr, &header_file, summary_file_list);
if (stringlist_get_size( summary_file_list ) > 0)
{
for (int i = 0; i < stringlist_get_size(summary_file_list); i++)
{
fileNames.push_back(RiaStringEncodingTools::fromNativeEncoded(stringlist_iget(summary_file_list, i)));
}
}
free(header_file);
stringlist_free(summary_file_list);
return fileNames;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/FileInterface/RifEclipseSummaryTools.h
View File

@@ -36,7 +36,6 @@ class RifEclipseSummaryTools
{
public:
static void findSummaryHeaderFile(const QString& inputFile, QString* headerFile, bool* isFormatted);
static QStringList findSummaryDataFiles(const QString& caseFile);
static QString findGridCaseFileFromSummaryHeaderFile(const QString& summaryHeaderFile);
static void findSummaryFiles(const QString& inputFile, QString* headerFile, QStringList* dataFiles);

52
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp
View File

@@ -116,58 +116,6 @@ std::vector<std::string> RifEclipseUserDataParserTools::splitLineAndRemoveCommen
return words;
}
////--------------------------------------------------------------------------------------------------
/////
////--------------------------------------------------------------------------------------------------
//RifEclipseSummaryAddress::SummaryVarCategory RifEclipseUserDataParserTools::identifyCategory(const std::string& word)
//{
// if (word.size() == 0) return RifEclipseSummaryAddress::SUMMARY_INVALID;
//
// if (!RiaStdStringTools::containsOnlyLettersAndDigits(word)) return RifEclipseSummaryAddress::SUMMARY_INVALID;
//
// if (word.size() > 2 && word[0] == 'R' && word[2] == 'F')
// {
// return RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION;
// }
//
// char firstLetter = word.at(0);
//
// if (firstLetter == 'A') return RifEclipseSummaryAddress::SUMMARY_AQUIFER;
// if (firstLetter == 'B') return RifEclipseSummaryAddress::SUMMARY_BLOCK;
// if (firstLetter == 'C') return RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION;
// if (firstLetter == 'F') return RifEclipseSummaryAddress::SUMMARY_FIELD;
// if (firstLetter == 'G') return RifEclipseSummaryAddress::SUMMARY_WELL_GROUP;
// if (firstLetter == 'N') return RifEclipseSummaryAddress::SUMMARY_NETWORK;
// if (firstLetter == 'R') return RifEclipseSummaryAddress::SUMMARY_REGION;
// if (firstLetter == 'S') return RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT;
// if (firstLetter == 'W') return RifEclipseSummaryAddress::SUMMARY_WELL;
//
// if (word.size() < 2) return RifEclipseSummaryAddress::SUMMARY_INVALID;
//
// std::string firstTwoLetters = word.substr(0, 2);
//
// if (firstTwoLetters == "LB") return RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR;
// if (firstTwoLetters == "LC") return RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR;
// if (firstTwoLetters == "LW") return RifEclipseSummaryAddress::SUMMARY_WELL_LGR;
//
// return RifEclipseSummaryAddress::SUMMARY_INVALID;
//}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RifEclipseUserDataParserTools::findFirstNonEmptyEntryIndex(std::vector<std::string>& list)
{
for (size_t i = 0; i < list.size(); i++)
{
if (!list[i].empty())
{
return i;
}
}
return list.size();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h
View File

@@ -146,7 +146,6 @@ public:
static bool isAComment(const std::string& word);
static std::vector<std::string> splitLineAndRemoveComments(const std::string& line);
static std::vector<double> splitLineToDoubles(const std::string& line);
static size_t findFirstNonEmptyEntryIndex(std::vector<std::string>& list);
static bool keywordParser(const std::string& line, std::string& origin, std::string& dateFormat, std::string& startDate);
static bool isANumber(const std::string& line);
static std::vector<std::string> headerReader(std::stringstream& streamData, std::string& line);