diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp index a0e36cc2d7..2c77fd6355 100644 --- a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp @@ -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 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) //-------------------------------------------------------------------------------------------------- @@ -99,8 +73,6 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, QList delta) diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h index 12ef4b90e3..b4644289de 100644 --- a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h +++ b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h @@ -46,7 +46,7 @@ public: static void findKeywordsAndDataItemCounts(ecl_file_type* ecl_file, QStringList* keywords, std::vector* keywordDataItemCounts); static bool keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector* 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* timeSteps, bool* detectedFractionOfDay = NULL); static bool fileSet(const QString& fileName, QStringList* fileSet); diff --git a/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h b/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h index 7850608b9e..25cf515ee0 100644 --- a/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h +++ b/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h @@ -45,8 +45,7 @@ public: virtual bool open(const QStringList& fileSet) = 0; virtual void close() = 0; - virtual size_t numTimeSteps() = 0; - virtual QStringList timeStepsText() = 0; + virtual size_t timeStepCount() = 0; virtual QList timeSteps() = 0; virtual void resultNames(QStringList* resultNames, std::vector* resultDataItemCounts) = 0; diff --git a/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp b/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp index 8cb009ac35..40b3e7a631 100644 --- a/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp +++ b/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp @@ -80,31 +80,11 @@ void RifEclipseRestartFilesetAccess::close() //-------------------------------------------------------------------------------------------------- /// Get the number of time steps //-------------------------------------------------------------------------------------------------- -size_t RifEclipseRestartFilesetAccess::numTimeSteps() +size_t RifEclipseRestartFilesetAccess::timeStepCount() { 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 //-------------------------------------------------------------------------------------------------- @@ -112,7 +92,7 @@ QList RifEclipseRestartFilesetAccess::timeSteps() { QList timeSteps; - size_t numSteps = numTimeSteps(); + size_t numSteps = timeStepCount(); size_t i; for (i = 0; i < numSteps; i++) { @@ -138,14 +118,14 @@ QList RifEclipseRestartFilesetAccess::timeSteps() //-------------------------------------------------------------------------------------------------- void RifEclipseRestartFilesetAccess::resultNames(QStringList* resultNames, std::vector* resultDataItemCounts) { - CVF_ASSERT(numTimeSteps() > 0); + CVF_ASSERT(timeStepCount() > 0); std::vector valueCountForOneFile; RifEclipseOutputFileTools::findKeywordsAndDataItemCounts(m_ecl_files[0], resultNames, &valueCountForOneFile); for (size_t i = 0; i < valueCountForOneFile.size(); i++) { - resultDataItemCounts->push_back(valueCountForOneFile[i] * numTimeSteps()); + resultDataItemCounts->push_back(valueCountForOneFile[i] * timeStepCount()); } } diff --git a/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h b/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h index 7d0a429073..7e0b181a44 100644 --- a/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h +++ b/ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h @@ -38,8 +38,7 @@ public: bool open(const QStringList& fileSet); void close(); - size_t numTimeSteps(); - QStringList timeStepsText(); + size_t timeStepCount(); QList timeSteps(); void resultNames(QStringList* resultNames, std::vector* resultDataItemCounts); diff --git a/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp b/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp index 4d1c6564b1..8fecb280e2 100644 --- a/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp +++ b/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp @@ -69,23 +69,9 @@ void RifEclipseUnifiedRestartFileAccess::close() //-------------------------------------------------------------------------------------------------- /// Get the number of time steps //-------------------------------------------------------------------------------------------------- -size_t RifEclipseUnifiedRestartFileAccess::numTimeSteps() +size_t RifEclipseUnifiedRestartFileAccess::timeStepCount() { - QStringList timeSteps = timeStepsText(); - 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; + return timeSteps().size(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h b/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h index 2079a0e363..f8188db60e 100644 --- a/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h +++ b/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h @@ -40,8 +40,7 @@ public: bool open(const QStringList& fileSet); void close(); - size_t numTimeSteps(); - QStringList timeStepsText(); + size_t timeStepCount(); QList timeSteps(); void resultNames(QStringList* resultNames, std::vector* resultDataItemCounts); diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index b84d2ab7f9..b050e9afce 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -413,7 +413,7 @@ bool RifReaderEclipseOutput::buildMetaData(RigReservoir* reservoir) 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) { @@ -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) {