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

Improved multi case initial reading

Browse Source 
When creating a multi case group from multiple files, read grid from first file.
The main grid from the first case is reused for the other cases.
NOTE: Metadata and well information is not read for the other cases
p4#: 20655
This commit is contained in:
Magne Sjaastad
2013-02-27 15:27:33 +01:00
parent 3dc027e29e
commit 3dbc8a9d57
6 changed files with 103 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ApplicationCode/Application/RIApplication.cpp
View File

@@ -1297,26 +1297,64 @@ void RIApplication::updateRegressionTest(const QString& testRootPath)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::addEclipseCase(const QString& fileName)
bool RIApplication::addEclipseCases(const QStringList& fileNames)
{
QFileInfo gridFileName(fileName);
if (fileNames.size() == 0) return true;
QString caseName = gridFileName.completeBaseName();
QString casePath = gridFileName.absolutePath();
RimResultReservoir* rimResultReservoir = new RimResultReservoir();
rimResultReservoir->caseName = caseName;
rimResultReservoir->caseFileName = fileName;
rimResultReservoir->caseDirectory = casePath;
// First file is read completely including grid.
// The main grid from the first case is reused directly in for the other cases.
// When reading active cell info, only the total cell count is tested for consistency
RigMainGrid* mainGrid = NULL;
m_project->reservoirs.push_back(rimResultReservoir);
{
QString firstFileName = fileNames[0];
QFileInfo gridFileName(firstFileName);
rimResultReservoir->openEclipseGridFile();
QString caseName = gridFileName.completeBaseName();
QString casePath = gridFileName.absolutePath();
m_project->moveEclipseCaseIntoCaseGroup(rimResultReservoir);
RimResultReservoir* rimResultReservoir = new RimResultReservoir();
rimResultReservoir->caseName = caseName;
rimResultReservoir->caseFileName = firstFileName;
rimResultReservoir->caseDirectory = casePath;
m_project->reservoirs.push_back(rimResultReservoir);
if (!rimResultReservoir->openEclipseGridFile())
{
return false;
}
m_project->moveEclipseCaseIntoCaseGroup(rimResultReservoir);
mainGrid = rimResultReservoir->reservoirData()->mainGrid();
}
for (int i = 1; i < fileNames.size(); i++)
{
QString fileName = fileNames[i];
QFileInfo gridFileName(fileName);
QString caseName = gridFileName.completeBaseName();
QString casePath = gridFileName.absolutePath();
RimResultReservoir* rimResultReservoir = new RimResultReservoir();
rimResultReservoir->caseName = caseName;
rimResultReservoir->caseFileName = fileName;
rimResultReservoir->caseDirectory = casePath;
m_project->reservoirs.push_back(rimResultReservoir);
if (!rimResultReservoir->openAndReadActiveCellData(mainGrid))
{
return false;
}
m_project->moveEclipseCaseIntoCaseGroup(rimResultReservoir);
}
onProjectOpenedOrClosed();
return true;
}

2
ApplicationCode/Application/RIApplication.h
View File

@@ -80,7 +80,7 @@ public:
bool openEclipseCaseFromFile(const QString& fileName);
bool openEclipseCase(const QString& caseName, const QString& caseFileName);
bool addEclipseCase(const QString& fileName);
bool addEclipseCases(const QStringList& fileNames);
bool openInputEclipseCase(const QString& caseName, const QStringList& caseFileNames);
bool loadLastUsedProject();