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

Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2014-10-28 10:17:02 +01:00
parent 79b45e7008
commit 5bb0b99ace
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@ -157,8 +157,8 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
RimCase* mainCase = caseCollection()->reservoirs[0]; RimCase* mainCase = caseCollection()->reservoirs[0];
mainCase->openEclipseGridFile(); mainCase->openEclipseGridFile();
RigCaseData* mainEclipseCase = mainCase->reservoirData(); RigCaseData* rigCaseData = mainCase->reservoirData();
if (mainEclipseCase) if (rigCaseData)
{ {
RifReaderInterface::PorosityModelResultType poroModel = RifReaderInterface::MATRIX_RESULTS; RifReaderInterface::PorosityModelResultType poroModel = RifReaderInterface::MATRIX_RESULTS;
RimReservoirCellResultsStorage* cellResultsStorage = mainCase->results(poroModel); RimReservoirCellResultsStorage* cellResultsStorage = mainCase->results(poroModel);
@ -182,7 +182,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
RimResultCase* rimReservoir = dynamic_cast<RimResultCase*>(caseCollection()->reservoirs[i]); RimResultCase* rimReservoir = dynamic_cast<RimResultCase*>(caseCollection()->reservoirs[i]);
if(!rimReservoir) continue; // Input reservoir if(!rimReservoir) continue; // Input reservoir
if (!rimReservoir->openAndReadActiveCellData(mainEclipseCase)) if (!rimReservoir->openAndReadActiveCellData(rigCaseData))
{ {
// Error message // Error message
continue; continue;
@ -191,7 +191,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
info.incrementProgress(); info.incrementProgress();
} }
m_mainGrid = mainEclipseCase->mainGrid(); m_mainGrid = rigCaseData->mainGrid();
// Check if we need to calculate the union of the active cells // Check if we need to calculate the union of the active cells
@ -222,8 +222,8 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
{ {
RifReaderInterface::PorosityModelResultType poroModel = RifReaderInterface::MATRIX_RESULTS; RifReaderInterface::PorosityModelResultType poroModel = RifReaderInterface::MATRIX_RESULTS;
std::vector<QDateTime> timeStepDates = mainEclipseCase->results(poroModel)->timeStepDates(0); std::vector<QDateTime> timeStepDates = rigCaseData->results(poroModel)->timeStepDates(0);
const std::vector<RigCaseCellResultsData::ResultInfo> resultInfos = mainEclipseCase->results(poroModel)->infoForEachResultIndex(); const std::vector<RigCaseCellResultsData::ResultInfo> resultInfos = rigCaseData->results(poroModel)->infoForEachResultIndex();
for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++) for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++)
{ {