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

Use keywordsWithGivenResultValueCount to clarify what is done when asking for result keywords

Browse Source 
p4#: 20274
This commit is contained in:
Magne Sjaastad
2013-01-29 08:17:45 +01:00
parent b610133117
commit 66a41c1ab9
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@@ -85,7 +85,7 @@ int RifEclipseOutputFileTools::numOccurrences(const QString& keyword)
/// Get keywords found on file given by name.
/// If numDataItems != cvf::UNDEFINED_SIZE_T, get keywords with that exact number of data items only.
//--------------------------------------------------------------------------------------------------
bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t numDataItems, size_t numSteps)
bool RifEclipseOutputFileTools::keywordsWithGivenResultValueCount(QStringList* keywords, size_t expectedResultValueCount, size_t numSteps)
{
CVF_ASSERT(m_file);
CVF_ASSERT(keywords);
@@ -98,16 +98,16 @@ bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t num
for (int i = 0; i < numKeywords; i++)
{
const char* kw = ecl_file_iget_distinct_kw(m_file , i);
int numKWOccurences = ecl_file_get_num_named_kw(m_file, kw);
int numKeywordOccurrences = ecl_file_get_num_named_kw(m_file, kw);
if (numDataItems != cvf::UNDEFINED_SIZE_T)
if (expectedResultValueCount != cvf::UNDEFINED_SIZE_T)
{
bool dataTypeSupported = true;
int numKWValues = 0;
int fileResultValueCount = 0;
int j;
for (j = 0; j < numKWOccurences; j++)
for (j = 0; j < numKeywordOccurrences; j++)
{
numKWValues += ecl_file_iget_named_size(m_file, kw, j);
fileResultValueCount += ecl_file_iget_named_size(m_file, kw, j);
// Check the data type - only float and double are supported
ecl_type_enum dataType = ecl_file_iget_named_type(m_file, kw, j);
@@ -122,11 +122,11 @@ bool RifEclipseOutputFileTools::keywordsOnFile(QStringList* keywords, size_t num
{
if (numSteps != cvf::UNDEFINED_SIZE_T && numSteps > 0)
{
numKWValues /= static_cast<int>(numSteps);
fileResultValueCount /= static_cast<int>(numSteps);
}
// Append keyword to the list if it has the given number of values in total
if (numKWValues == static_cast<int>(numDataItems))
if (fileResultValueCount == static_cast<int>(expectedResultValueCount))
{
keywords->append(QString(kw));
}

2
ApplicationCode/FileInterface/RifEclipseOutputFileTools.h
View File

@@ -43,7 +43,7 @@ public:
void close();
int numOccurrences(const QString& keyword);
bool keywordsOnFile(QStringList* keywords, size_t numDataItems = cvf::UNDEFINED_SIZE_T, size_t numSteps = cvf::UNDEFINED_SIZE_T);
bool keywordsWithGivenResultValueCount(QStringList* keywords, size_t expectedResultValueCount = cvf::UNDEFINED_SIZE_T, size_t numSteps = cvf::UNDEFINED_SIZE_T);
bool timeStepsText(QStringList* timeSteps);
bool timeSteps(QList<QDateTime>* timeSteps);

2
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
View File

@@ -131,7 +131,7 @@ QStringList RifEclipseRestartFilesetAccess::resultNames()
// Get the results found on the first file
QStringList resultsList;
m_files[0]->keywordsOnFile(&resultsList, m_numActiveCells, 1);
m_files[0]->keywordsWithGivenResultValueCount(&resultsList, m_numActiveCells, 1);
return resultsList;
}

2
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
View File

@@ -114,7 +114,7 @@ QStringList RifEclipseUnifiedRestartFileAccess::resultNames()
{
// Get the results found on the UNRST file
QStringList resultsList;
m_file->keywordsOnFile(&resultsList, m_numActiveCells, numTimeSteps());
m_file->keywordsWithGivenResultValueCount(&resultsList, m_numActiveCells, numTimeSteps());
return resultsList;
}

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -368,7 +368,7 @@ bool RifReaderEclipseOutput::buildMetaData(RigReservoir* reservoir)
// Get the names of the static results
QStringList staticResults;
initFile->keywordsOnFile(&staticResults, numActiveCells);
initFile->keywordsWithGivenResultValueCount(&staticResults, numActiveCells);
QStringList staticResultNames = staticResults;
QList<QDateTime> staticDate;