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

Removed access method for time step texts, as it was not used

Browse Source 
p4#: 20400
This commit is contained in:
Magne Sjaastad 2013-02-07 08:41:40 +01:00
parent 3906298cb6
commit 0ed6c97ee3
8 changed files with 12 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@ -43,32 +43,6 @@ RifEclipseOutputFileTools::~RifEclipseOutputFileTools()
{ {
} }
//--------------------------------------------------------------------------------------------------
/// Get list of time step texts (dates)
//--------------------------------------------------------------------------------------------------
void RifEclipseOutputFileTools::timeStepsText(ecl_file_type* ecl_file, QStringList* timeSteps)
{
CVF_ASSERT(timeSteps);
CVF_ASSERT(ecl_file);
QList<QDateTime> timeStepDates;
bool hasFractionOfDays = false;
RifEclipseOutputFileTools::timeSteps(ecl_file, &timeStepDates, &hasFractionOfDays);
QString formatString = "dd/MM/yyyy";
if (hasFractionOfDays)
{
formatString += "- hh:mm";
}
for (int i = 0; i < timeStepDates.size(); i++)
{
QString timeString = timeStepDates[i].toString(formatString);
timeSteps->push_back(timeString);
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Get list of time step texts (dates) /// Get list of time step texts (dates)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -99,8 +73,6 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, QList<QDateTi
if (kwDOUBHEAD) if (kwDOUBHEAD)
{ {
double dayValue = ecl_kw_iget_double(kwDOUBHEAD, DOUBHEAD_DAYS_INDEX); double dayValue = ecl_kw_iget_double(kwDOUBHEAD, DOUBHEAD_DAYS_INDEX);
qDebug() << dayValue;
double floorDayValue = cvf::Math::floor(dayValue); double floorDayValue = cvf::Math::floor(dayValue);
if (dayValue - floorDayValue > delta) if (dayValue - floorDayValue > delta)

2
ApplicationCode/FileInterface/RifEclipseOutputFileTools.h
View File

@ -46,7 +46,7 @@ public:
static void findKeywordsAndDataItemCounts(ecl_file_type* ecl_file, QStringList* keywords, std::vector<size_t>* keywordDataItemCounts); static void findKeywordsAndDataItemCounts(ecl_file_type* ecl_file, QStringList* keywords, std::vector<size_t>* keywordDataItemCounts);
static bool keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<double>* values); static bool keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<double>* values);
static void timeStepsText(ecl_file_type* ecl_file, QStringList* timeSteps); // static void timeStepsText(ecl_file_type* ecl_file, QStringList* timeSteps);
static void timeSteps(ecl_file_type* ecl_file, QList<QDateTime>* timeSteps, bool* detectedFractionOfDay = NULL); static void timeSteps(ecl_file_type* ecl_file, QList<QDateTime>* timeSteps, bool* detectedFractionOfDay = NULL);
static bool fileSet(const QString& fileName, QStringList* fileSet); static bool fileSet(const QString& fileName, QStringList* fileSet);

3
ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
View File

@ -45,8 +45,7 @@ public:
virtual bool open(const QStringList& fileSet) = 0; virtual bool open(const QStringList& fileSet) = 0;
virtual void close() = 0; virtual void close() = 0;
virtual size_t numTimeSteps() = 0; virtual size_t timeStepCount() = 0;
virtual QStringList timeStepsText() = 0;
virtual QList<QDateTime> timeSteps() = 0; virtual QList<QDateTime> timeSteps() = 0;
virtual void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts) = 0; virtual void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts) = 0;

28
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
View File

@ -80,31 +80,11 @@ void RifEclipseRestartFilesetAccess::close()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Get the number of time steps /// Get the number of time steps
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RifEclipseRestartFilesetAccess::numTimeSteps() size_t RifEclipseRestartFilesetAccess::timeStepCount()
{ {
return m_ecl_files.size(); return m_ecl_files.size();
} }
//--------------------------------------------------------------------------------------------------
/// Get the time step texts
//--------------------------------------------------------------------------------------------------
QStringList RifEclipseRestartFilesetAccess::timeStepsText()
{
QStringList timeSteps;
size_t numSteps = numTimeSteps();
size_t i;
for (i = 0; i < numSteps; i++)
{
QStringList stepText;
RifEclipseOutputFileTools::timeStepsText(m_ecl_files[i], &stepText);
timeSteps.append(stepText.size() == 1 ? stepText : QStringList(QString("Step %1").arg(i+1)));
}
return timeSteps;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Get the time steps /// Get the time steps
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -112,7 +92,7 @@ QList<QDateTime> RifEclipseRestartFilesetAccess::timeSteps()
{ {
QList<QDateTime> timeSteps; QList<QDateTime> timeSteps;
size_t numSteps = numTimeSteps(); size_t numSteps = timeStepCount();
size_t i; size_t i;
for (i = 0; i < numSteps; i++) for (i = 0; i < numSteps; i++)
{ {
@ -138,14 +118,14 @@ QList<QDateTime> RifEclipseRestartFilesetAccess::timeSteps()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RifEclipseRestartFilesetAccess::resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts) void RifEclipseRestartFilesetAccess::resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts)
{ {
CVF_ASSERT(numTimeSteps() > 0); CVF_ASSERT(timeStepCount() > 0);
std::vector<size_t> valueCountForOneFile; std::vector<size_t> valueCountForOneFile;
RifEclipseOutputFileTools::findKeywordsAndDataItemCounts(m_ecl_files[0], resultNames, &valueCountForOneFile); RifEclipseOutputFileTools::findKeywordsAndDataItemCounts(m_ecl_files[0], resultNames, &valueCountForOneFile);
for (size_t i = 0; i < valueCountForOneFile.size(); i++) for (size_t i = 0; i < valueCountForOneFile.size(); i++)
{ {
resultDataItemCounts->push_back(valueCountForOneFile[i] * numTimeSteps()); resultDataItemCounts->push_back(valueCountForOneFile[i] * timeStepCount());
} }
} }

3
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h
View File

@ -38,8 +38,7 @@ public:
bool open(const QStringList& fileSet); bool open(const QStringList& fileSet);
void close(); void close();
size_t numTimeSteps(); size_t timeStepCount();
QStringList timeStepsText();
QList<QDateTime> timeSteps(); QList<QDateTime> timeSteps();
void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts); void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts);

18
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
View File

@ -69,23 +69,9 @@ void RifEclipseUnifiedRestartFileAccess::close()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Get the number of time steps /// Get the number of time steps
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RifEclipseUnifiedRestartFileAccess::numTimeSteps() size_t RifEclipseUnifiedRestartFileAccess::timeStepCount()
{ {
QStringList timeSteps = timeStepsText(); return timeSteps().size();
return timeSteps.size();
}
//--------------------------------------------------------------------------------------------------
/// Get the time step texts
//--------------------------------------------------------------------------------------------------
QStringList RifEclipseUnifiedRestartFileAccess::timeStepsText()
{
CVF_ASSERT(m_ecl_file != NULL);
QStringList timeSteps;
RifEclipseOutputFileTools::timeStepsText(m_ecl_file, &timeSteps);
return timeSteps;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h
View File

@ -40,8 +40,7 @@ public:
bool open(const QStringList& fileSet); bool open(const QStringList& fileSet);
void close(); void close();
size_t numTimeSteps(); size_t timeStepCount();
QStringList timeStepsText();
QList<QDateTime> timeSteps(); QList<QDateTime> timeSteps();
void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts); void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts);

4
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -413,7 +413,7 @@ bool RifReaderEclipseOutput::buildMetaData(RigReservoir* reservoir)
m_dynamicResultsAccess->resultNames(&resultNames, &resultNamesDataItemCounts); m_dynamicResultsAccess->resultNames(&resultNames, &resultNamesDataItemCounts);
{ {
QStringList matrixResultNames = validKeywordsForPorosityModel(resultNames, resultNamesDataItemCounts, RifReaderInterface::MATRIX_RESULTS, m_dynamicResultsAccess->numTimeSteps()); QStringList matrixResultNames = validKeywordsForPorosityModel(resultNames, resultNamesDataItemCounts, RifReaderInterface::MATRIX_RESULTS, m_dynamicResultsAccess->timeStepCount());
for (int i = 0; i < matrixResultNames.size(); ++i) for (int i = 0; i < matrixResultNames.size(); ++i)
{ {
@ -423,7 +423,7 @@ bool RifReaderEclipseOutput::buildMetaData(RigReservoir* reservoir)
} }
{ {
QStringList fractureResultNames = validKeywordsForPorosityModel(resultNames, resultNamesDataItemCounts, RifReaderInterface::FRACTURE_RESULTS, m_dynamicResultsAccess->numTimeSteps()); QStringList fractureResultNames = validKeywordsForPorosityModel(resultNames, resultNamesDataItemCounts, RifReaderInterface::FRACTURE_RESULTS, m_dynamicResultsAccess->timeStepCount());
for (int i = 0; i < fractureResultNames.size(); ++i) for (int i = 0; i < fractureResultNames.size(); ++i)
{ {