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

#1693 Removed "close" from eclipse reader interface as it never did anything

Browse Source
This commit is contained in:
Jacob Støren
2017-09-11 11:00:09 +02:00
parent 414823827a
commit 1999d2b6e4
9 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/FileInterface/RifReaderEclipseInput.cpp
View File

@@ -52,9 +52,6 @@ bool RifReaderEclipseInput::open(const QString& fileName, RigEclipseCaseData* ec
{ {
CVF_ASSERT(eclipseCase); CVF_ASSERT(eclipseCase);
// Make sure everything's closed
close();
// Should we handle gridless properties ? // Should we handle gridless properties ?
// If so, they must match dimensions, and a grid afterwards must match dimension // If so, they must match dimensions, and a grid afterwards must match dimension

4
ApplicationCode/FileInterface/RifReaderEclipseInput.h
View File

@@ -34,10 +34,6 @@ public:
// Virtual interface implementation // Virtual interface implementation
virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase); virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase);
virtual void close() {}
virtual bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values ) { return false; } virtual bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values ) { return false; }
virtual bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values ) { return false; } virtual bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values ) { return false; }
}; };

15
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -216,8 +216,6 @@ RifReaderEclipseOutput::RifReaderEclipseOutput()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifReaderEclipseOutput::~RifReaderEclipseOutput() RifReaderEclipseOutput::~RifReaderEclipseOutput()
{ {
close();
if (m_ecl_init_file) if (m_ecl_init_file)
{ {
ecl_file_close(m_ecl_init_file); ecl_file_close(m_ecl_init_file);
@@ -231,14 +229,6 @@ RifReaderEclipseOutput::~RifReaderEclipseOutput()
} }
//--------------------------------------------------------------------------------------------------
/// Close interface (for now, no files are kept open after calling methods, so just clear members)
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseOutput::close()
{
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Read geometry from file given by name into given reservoir object /// Read geometry from file given by name into given reservoir object
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -367,9 +357,6 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* e
progInfo.setProgressDescription("Reading Grid"); progInfo.setProgressDescription("Reading Grid");
// Make sure everything's closed
close();
// Get set of files // Get set of files
QStringList fileSet; QStringList fileSet;
if (!RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName(fileName, &fileSet)) return false; if (!RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName(fileName, &fileSet)) return false;
@@ -666,8 +653,6 @@ bool RifReaderEclipseOutput::openAndReadActiveCellData(const QString& fileName,
return false; return false;
} }
close();
// Get set of files // Get set of files
QStringList fileSet; QStringList fileSet;
if (!RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName(fileName, &fileSet)) return false; if (!RifEclipseOutputFileTools::findSiblingFilesWithSameBaseName(fileName, &fileSet)) return false;

1
ApplicationCode/FileInterface/RifReaderEclipseOutput.h
View File

@@ -57,7 +57,6 @@ public:
void setFileDataAccess(RifEclipseRestartDataAccess* restartDataAccess); void setFileDataAccess(RifEclipseRestartDataAccess* restartDataAccess);
virtual bool openAndReadActiveCellData(const QString& fileName, const std::vector<QDateTime>& mainCaseTimeSteps, RigEclipseCaseData* eclipseCase); virtual bool openAndReadActiveCellData(const QString& fileName, const std::vector<QDateTime>& mainCaseTimeSteps, RigEclipseCaseData* eclipseCase);
void close();
bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values); bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values);
bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values); bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values);

1
ApplicationCode/FileInterface/RifReaderInterface.h
View File

@@ -55,7 +55,6 @@ public:
const QString faultIncludeFileAbsolutePathPrefix(); const QString faultIncludeFileAbsolutePathPrefix();
virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase) = 0; virtual bool open(const QString& fileName, RigEclipseCaseData* eclipseCase) = 0;
virtual void close() = 0;
virtual bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values) = 0; virtual bool staticResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values) = 0;
virtual bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values) = 0; virtual bool dynamicResult(const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values) = 0;

9
ApplicationCode/FileInterface/RifReaderMockModel.cpp
View File

@@ -93,15 +93,6 @@ bool RifReaderMockModel::open(const QString& fileName, RigEclipseCaseData* eclip
return true; return true;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderMockModel::close()
{
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/FileInterface/RifReaderMockModel.h
View File

@@ -37,7 +37,6 @@ public:
void addLocalGridRefinement(const cvf::Vec3st& minCellPosition, const cvf::Vec3st& maxCellPosition, const cvf::Vec3st& singleCellRefinementFactors); void addLocalGridRefinement(const cvf::Vec3st& minCellPosition, const cvf::Vec3st& maxCellPosition, const cvf::Vec3st& singleCellRefinementFactors);
virtual bool open( const QString& fileName, RigEclipseCaseData* eclipseCase ); virtual bool open( const QString& fileName, RigEclipseCaseData* eclipseCase );
virtual void close();
virtual bool staticResult( const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values ); virtual bool staticResult( const QString& result, RiaDefines::PorosityModelType matrixOrFracture, std::vector<double>* values );
virtual bool dynamicResult( const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values ); virtual bool dynamicResult( const QString& result, RiaDefines::PorosityModelType matrixOrFracture, size_t stepIndex, std::vector<double>* values );

2
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -257,8 +257,6 @@ bool RimEclipseResultCase::openAndReadActiveCellData(RigEclipseCaseData* mainEcl
return false; return false;
} }
readerEclipseOutput->close();
this->setReservoirData( eclipseCase.p() ); this->setReservoirData( eclipseCase.p() );
readerInterface = readerEclipseOutput; readerInterface = readerEclipseOutput;

3
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp
View File

@@ -305,9 +305,6 @@ void RimEclipseStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>&
eclipseCase->results(RiaDefines::FRACTURE_MODEL)->cellResults()->freeAllocatedResultsData(); eclipseCase->results(RiaDefines::FRACTURE_MODEL)->cellResults()->freeAllocatedResultsData();
} }
// Todo : These calls really do nothing right now the access actually closes automatically in ert i belive ...
eclipseCase->results(RiaDefines::MATRIX_MODEL)->readerInterface()->close();
eclipseCase->results(RiaDefines::FRACTURE_MODEL)->readerInterface()->close();
} }
progressInfo.setProgress(timeIndicesIdx); progressInfo.setProgress(timeIndicesIdx);