OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improved robustness in file reader

Browse Source 
p4#: 21358
This commit is contained in:
Magne Sjaastad 2013-04-22 13:24:49 +02:00
parent 8c28e8ff6c
commit ea45e6f072
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -378,7 +378,7 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC
m_eclipseCase = eclipseCase; m_eclipseCase = eclipseCase;
// Build results meta data // Build results meta data
if (!buildMetaData()) return false; buildMetaData();
progInfo.incrementProgress(); progInfo.incrementProgress();
progInfo.setNextProgressIncrement(8); progInfo.setNextProgressIncrement(8);
@ -420,14 +420,11 @@ bool RifReaderEclipseOutput::openAndReadActiveCellData(const QString& fileName,
return false; return false;
} }
// Reading of metadata and well cells is not performed here
//if (!buildMetaData()) return false;
// readWellCells();
m_dynamicResultsAccess = createDynamicResultsAccess(); m_dynamicResultsAccess = createDynamicResultsAccess();
if (m_dynamicResultsAccess.notNull())
{
m_dynamicResultsAccess->setTimeSteps(mainCaseTimeSteps); m_dynamicResultsAccess->setTimeSteps(mainCaseTimeSteps);
}
return true; return true;
} }
@ -523,7 +520,7 @@ bool RifReaderEclipseOutput::readActiveCellInfo()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Build meta data - get states and results info /// Build meta data - get states and results info
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifReaderEclipseOutput::buildMetaData() void RifReaderEclipseOutput::buildMetaData()
{ {
CVF_ASSERT(m_eclipseCase); CVF_ASSERT(m_eclipseCase);
CVF_ASSERT(m_filesWithSameBaseName.size() > 0); CVF_ASSERT(m_filesWithSameBaseName.size() > 0);
@ -536,12 +533,11 @@ bool RifReaderEclipseOutput::buildMetaData()
m_dynamicResultsAccess = createDynamicResultsAccess(); m_dynamicResultsAccess = createDynamicResultsAccess();
if (m_dynamicResultsAccess.isNull()) if (m_dynamicResultsAccess.isNull())
{ {
return false; return;
} }
m_dynamicResultsAccess->open(); m_dynamicResultsAccess->open();
progInfo.incrementProgress(); progInfo.incrementProgress();
RigCaseCellResultsData* matrixModelResults = m_eclipseCase->results(RifReaderInterface::MATRIX_RESULTS); RigCaseCellResultsData* matrixModelResults = m_eclipseCase->results(RifReaderInterface::MATRIX_RESULTS);
@ -634,8 +630,6 @@ bool RifReaderEclipseOutput::buildMetaData()
} }
} }
} }
return true;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -706,12 +700,8 @@ bool RifReaderEclipseOutput::dynamicResult(const QString& result, PorosityModelR
m_dynamicResultsAccess = createDynamicResultsAccess(); m_dynamicResultsAccess = createDynamicResultsAccess();
} }
if (m_dynamicResultsAccess.isNull()) if (m_dynamicResultsAccess.notNull())
{ {
CVF_ASSERT(false);
return false;
}
std::vector<double> fileValues; std::vector<double> fileValues;
if (!m_dynamicResultsAccess->results(result, stepIndex, m_eclipseCase->mainGrid()->gridCount(), &fileValues)) if (!m_dynamicResultsAccess->results(result, stepIndex, m_eclipseCase->mainGrid()->gridCount(), &fileValues))
{ {
@ -719,6 +709,7 @@ bool RifReaderEclipseOutput::dynamicResult(const QString& result, PorosityModelR
} }
extractResultValuesBasedOnPorosityModel(matrixOrFracture, values, fileValues); extractResultValuesBasedOnPorosityModel(matrixOrFracture, values, fileValues);
}
return true; return true;
} }

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.h
View File

@ -54,7 +54,7 @@ public:
private: private:
bool readActiveCellInfo(); bool readActiveCellInfo();
bool buildMetaData(); void buildMetaData();
void readWellCells(); void readWellCells();
bool openInitFile(); bool openInitFile();