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 raw pointers in file readers to avoid circular references

Browse Source 
p4#: 20826
This commit is contained in:
Magne Sjaastad
2013-03-08 08:24:40 +01:00
parent d4a28126d1
commit f6fa801607
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -207,6 +207,7 @@ RifReaderEclipseOutput::RifReaderEclipseOutput()
//--------------------------------------------------------------------------------------------------
RifReaderEclipseOutput::~RifReaderEclipseOutput()
{
close();
}
@@ -440,7 +441,7 @@ bool RifReaderEclipseOutput::openAndReadActiveCellData(const QString& fileName,
//--------------------------------------------------------------------------------------------------
bool RifReaderEclipseOutput::readActiveCellInfo()
{
CVF_ASSERT(m_eclipseCase.notNull());
CVF_ASSERT(m_eclipseCase);
CVF_ASSERT(m_eclipseCase->mainGrid());
QString egridFileName = RifEclipseOutputFileTools::fileNameByType(m_fileSet, ECL_EGRID_FILE);
@@ -521,7 +522,7 @@ bool RifReaderEclipseOutput::readActiveCellInfo()
//--------------------------------------------------------------------------------------------------
bool RifReaderEclipseOutput::buildMetaData()
{
CVF_ASSERT(m_eclipseCase.notNull());
CVF_ASSERT(m_eclipseCase);
CVF_ASSERT(m_fileSet.size() > 0);
caf::ProgressInfo progInfo(m_fileSet.size() + 3,"");
@@ -712,7 +713,7 @@ bool RifReaderEclipseOutput::dynamicResult(const QString& result, PorosityModelR
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseOutput::readWellCells()
{
CVF_ASSERT(m_eclipseCase.notNull());
CVF_ASSERT(m_eclipseCase);
if (m_dynamicResultsAccess.isNull()) return;