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 building of metadata from existing time steps

Browse Source 
Improved statistics calculation for opening single time step files
Close all dynamic access files when a time step statistics is complete
p4#: 20756
This commit is contained in:
Magne Sjaastad
2013-03-05 13:10:26 +01:00
parent 452b08db3a
commit e94264a39f
16 changed files with 264 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimResultReservoir.cpp
View File

@@ -93,7 +93,7 @@ bool RimResultReservoir::openEclipseGridFile()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimResultReservoir::openAndReadActiveCellData(RigMainGrid* mainGrid)
bool RimResultReservoir::openAndReadActiveCellData(RigEclipseCase* mainEclipseCase)
{
cvf::ref<RifReaderInterface> readerInterface;
@@ -113,10 +113,12 @@ bool RimResultReservoir::openAndReadActiveCellData(RigMainGrid* mainGrid)
}
cvf::ref<RigEclipseCase> eclipseCase = new RigEclipseCase;
eclipseCase->setMainGrid(mainGrid);
CVF_ASSERT(mainEclipseCase && mainEclipseCase->mainGrid());
eclipseCase->setMainGrid(mainEclipseCase->mainGrid());
readerInterface = new RifReaderEclipseOutput;
if (!readerInterface->openAndReadActiveCellData(fname, eclipseCase.p()))
if (!readerInterface->openAndReadActiveCellData(fname, mainEclipseCase, eclipseCase.p()))
{
return false;
}

2
ApplicationCode/ProjectDataModel/RimResultReservoir.h
View File

@@ -46,7 +46,7 @@ public:
caf::PdmField<QString> caseDirectory;
virtual bool openEclipseGridFile();
bool openAndReadActiveCellData(RigMainGrid* mainGrid);
bool openAndReadActiveCellData(RigEclipseCase* mainEclipseCase);
//virtual caf::PdmFieldHandle* userDescriptionField() { return &caseName;}

8
ApplicationCode/ProjectDataModel/RimStatisticalCalculation.cpp
View File

@@ -152,8 +152,12 @@ void RimStatisticalCalculation::computeStatistics()
RigStatisticsConfig statisticsConfig;
std::vector<size_t> timeStepIndices;
timeStepIndices.push_back(0);
timeStepIndices.push_back(1);
size_t timeStepCount = sourceCases.at(0)->results(RifReaderInterface::MATRIX_RESULTS)->maxTimeStepCount();
for (size_t i = 0; i < timeStepCount; i++)
{
timeStepIndices.push_back(i);
}
RigEclipseCase* resultCase = reservoirData();