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

Added support for lazy file parsing and improved closing of files

Browse Source 
p4#: 20644
This commit is contained in:
Magne Sjaastad 2013-02-27 14:01:36 +01:00
parent 092974a7fa
commit 7694c5d02d
4 changed files with 113 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
View File

@ -42,7 +42,7 @@ RifEclipseRestartFilesetAccess::~RifEclipseRestartFilesetAccess()
//--------------------------------------------------------------------------------------------------
bool RifEclipseRestartFilesetAccess::open(const QStringList& fileSet)
{
close();
setFileSet(fileSet);
int numFiles = fileSet.size();
@ -53,10 +53,7 @@ bool RifEclipseRestartFilesetAccess::open(const QStringList& fileSet)
{
progInfo.setProgressDescription(fileSet[i]);
ecl_file_type* ecl_file = ecl_file_open(fileSet[i].toAscii().data());
if (!ecl_file) return false;
m_ecl_files.push_back(ecl_file);
openTimeStep(i);
progInfo.incrementProgress();
}
@ -64,6 +61,24 @@ bool RifEclipseRestartFilesetAccess::open(const QStringList& fileSet)
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifEclipseRestartFilesetAccess::setFileSet(const QStringList& fileSet)
{
close();
m_ecl_files.clear();
m_fileNames = fileSet;
for (int i = 0; i < m_fileNames.size(); i++)
{
m_ecl_files.push_back(NULL);
}
CVF_ASSERT(m_fileNames.size() == m_ecl_files.size());
}
//--------------------------------------------------------------------------------------------------
/// Close files
//--------------------------------------------------------------------------------------------------
@ -71,10 +86,13 @@ void RifEclipseRestartFilesetAccess::close()
{
for (size_t i = 0; i < m_ecl_files.size(); i++)
{
ecl_file_close(m_ecl_files[i]);
}
m_ecl_files.clear();
if (m_ecl_files[i])
{
ecl_file_close(m_ecl_files[i]);
}
m_ecl_files[i] = NULL;
}
}
//--------------------------------------------------------------------------------------------------
@ -98,6 +116,8 @@ QList<QDateTime> RifEclipseRestartFilesetAccess::timeSteps()
{
QList<QDateTime> stepTime;
openTimeStep(i);
RifEclipseOutputFileTools::timeSteps(m_ecl_files[i], &stepTime);
if (stepTime.size() == 1)
@ -120,6 +140,8 @@ void RifEclipseRestartFilesetAccess::resultNames(QStringList* resultNames, std::
{
CVF_ASSERT(timeStepCount() > 0);
openTimeStep(0);
std::vector<size_t> valueCountForOneFile;
RifEclipseOutputFileTools::findKeywordsAndDataItemCounts(m_ecl_files[0], resultNames, &valueCountForOneFile);
@ -134,28 +156,35 @@ void RifEclipseRestartFilesetAccess::resultNames(QStringList* resultNames, std::
//--------------------------------------------------------------------------------------------------
bool RifEclipseRestartFilesetAccess::results(const QString& resultName, size_t timeStep, size_t gridCount, std::vector<double>* values)
{
size_t numOccurrences = ecl_file_get_num_named_kw(m_ecl_files[timeStep], resultName.toAscii().data());
if (timeStep >= timeStepCount())
{
return false;
}
openTimeStep(timeStep);
size_t fileGridCount = ecl_file_get_num_named_kw(m_ecl_files[timeStep], resultName.toAscii().data());
// No results for this result variable for current time step found
if (numOccurrences == 0) return true;
if (fileGridCount == 0) return true;
// Result handling depends on presents of result values for all grids
if (gridCount != numOccurrences)
if (gridCount != fileGridCount)
{
return false;
}
size_t i;
for (i = 0; i < numOccurrences; i++)
for (i = 0; i < fileGridCount; i++)
{
std::vector<double> partValues;
std::vector<double> gridValues;
if (!RifEclipseOutputFileTools::keywordData(m_ecl_files[timeStep], resultName, i, &partValues))
if (!RifEclipseOutputFileTools::keywordData(m_ecl_files[timeStep], resultName, i, &gridValues))
{
return false;
}
values->insert(values->end(), partValues.begin(), partValues.end());
values->insert(values->end(), gridValues.begin(), gridValues.end());
}
return true;
@ -171,6 +200,8 @@ void RifEclipseRestartFilesetAccess::readWellData(well_info_type* well_info)
for (size_t i = 0; i < m_ecl_files.size(); i++)
{
openTimeStep(i);
const char* fileName = ecl_file_get_src_file(m_ecl_files[i]);
int reportNumber = ecl_util_filename_report_nr(fileName);
if(reportNumber != -1)
@ -179,3 +210,20 @@ void RifEclipseRestartFilesetAccess::readWellData(well_info_type* well_info)
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifEclipseRestartFilesetAccess::openTimeStep(size_t timeStep)
{
CVF_ASSERT(timeStep < m_ecl_files.size());
if (m_ecl_files[timeStep] == NULL)
{
int index = static_cast<int>(timeStep);
ecl_file_type* ecl_file = ecl_file_open(m_fileNames[index].toAscii().data());
m_ecl_files[timeStep] = ecl_file;
}
}

7
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h
View File

@ -36,6 +36,7 @@ public:
virtual ~RifEclipseRestartFilesetAccess();
bool open(const QStringList& fileSet);
void setFileSet(const QStringList& fileSet);
void close();
size_t timeStepCount();
@ -47,5 +48,9 @@ public:
virtual void readWellData(well_info_type* well_info);
private:
std::vector< ecl_file_type* > m_ecl_files;
void openTimeStep(size_t timeStep);
private:
QStringList m_fileNames;
std::vector< ecl_file_type* > m_ecl_files;
};

54
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
View File

@ -38,12 +38,7 @@ RifEclipseUnifiedRestartFileAccess::RifEclipseUnifiedRestartFileAccess()
//--------------------------------------------------------------------------------------------------
RifEclipseUnifiedRestartFileAccess::~RifEclipseUnifiedRestartFileAccess()
{
if (m_ecl_file)
{
ecl_file_close(m_ecl_file);
}
m_ecl_file = NULL;
close();
}
//--------------------------------------------------------------------------------------------------
@ -51,9 +46,17 @@ RifEclipseUnifiedRestartFileAccess::~RifEclipseUnifiedRestartFileAccess()
//--------------------------------------------------------------------------------------------------
bool RifEclipseUnifiedRestartFileAccess::open(const QStringList& fileSet)
{
QString fileName = fileSet[0];
m_filename = fileSet[0];
m_ecl_file = ecl_file_open(fileName.toAscii().data());
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifEclipseUnifiedRestartFileAccess::openFile()
{
m_ecl_file = ecl_file_open(m_filename.toAscii().data());
if (!m_ecl_file) return false;
return true;
@ -64,6 +67,12 @@ bool RifEclipseUnifiedRestartFileAccess::open(const QStringList& fileSet)
//--------------------------------------------------------------------------------------------------
void RifEclipseUnifiedRestartFileAccess::close()
{
if (m_ecl_file)
{
ecl_file_close(m_ecl_file);
}
m_ecl_file = NULL;
}
//--------------------------------------------------------------------------------------------------
@ -71,6 +80,11 @@ void RifEclipseUnifiedRestartFileAccess::close()
//--------------------------------------------------------------------------------------------------
size_t RifEclipseUnifiedRestartFileAccess::timeStepCount()
{
if (!openFile())
{
return 0;
}
return timeSteps().size();
}
@ -79,10 +93,12 @@ size_t RifEclipseUnifiedRestartFileAccess::timeStepCount()
//--------------------------------------------------------------------------------------------------
QList<QDateTime> RifEclipseUnifiedRestartFileAccess::timeSteps()
{
CVF_ASSERT(m_ecl_file != NULL);
QList<QDateTime> timeSteps;
RifEclipseOutputFileTools::timeSteps(m_ecl_file, &timeSteps);
if (openFile())
{
RifEclipseOutputFileTools::timeSteps(m_ecl_file, &timeSteps);
}
return timeSteps;
}
@ -92,7 +108,10 @@ QList<QDateTime> RifEclipseUnifiedRestartFileAccess::timeSteps()
//--------------------------------------------------------------------------------------------------
void RifEclipseUnifiedRestartFileAccess::resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts)
{
RifEclipseOutputFileTools::findKeywordsAndDataItemCounts(m_ecl_file, resultNames, resultDataItemCounts);
if (openFile())
{
RifEclipseOutputFileTools::findKeywordsAndDataItemCounts(m_ecl_file, resultNames, resultDataItemCounts);
}
}
//--------------------------------------------------------------------------------------------------
@ -100,6 +119,11 @@ void RifEclipseUnifiedRestartFileAccess::resultNames(QStringList* resultNames, s
//--------------------------------------------------------------------------------------------------
bool RifEclipseUnifiedRestartFileAccess::results(const QString& resultName, size_t timeStep, size_t gridCount, std::vector<double>* values)
{
if (!openFile())
{
return false;
}
size_t numOccurrences = ecl_file_get_num_named_kw(m_ecl_file, resultName.toAscii().data());
size_t startIndex = timeStep * gridCount;
@ -124,8 +148,10 @@ bool RifEclipseUnifiedRestartFileAccess::results(const QString& resultName, size
void RifEclipseUnifiedRestartFileAccess::readWellData(well_info_type* well_info)
{
if (!well_info) return;
CVF_ASSERT(m_ecl_file);
well_info_add_UNRST_wells(well_info, m_ecl_file);
if (openFile())
{
well_info_add_UNRST_wells(well_info, m_ecl_file);
}
}

4
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h
View File

@ -49,5 +49,9 @@ public:
virtual void readWellData(well_info_type * well_info);
private:
bool openFile();
private:
QString m_filename;
ecl_file_type* m_ecl_file;
};