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

Renamed RigReservoir to RigEclipseCase

Browse Source 
p4#: 20500
This commit is contained in:
Magne Sjaastad
2013-02-13 13:24:39 +01:00
parent b1cb8a6716
commit ec8817e207
29 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp
View File

@@ -82,8 +82,8 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames)
if (m_rigReservoir.isNull())
{
RigReservoir* reservoir = new RigReservoir;
m_rigReservoir = reservoir;
RigEclipseCase* eclipseCase = new RigEclipseCase;
m_rigReservoir = eclipseCase;
}
// First find and read the grid data
@@ -168,15 +168,15 @@ bool RimInputReservoir::openEclipseGridFile()
}
else
{
RigReservoir* reservoir = new RigReservoir;
RigEclipseCase* eclipseCase = new RigEclipseCase;
readerInterface = new RifReaderEclipseInput;
if (!readerInterface->open(m_gridFileName, reservoir))
if (!readerInterface->open(m_gridFileName, eclipseCase))
{
delete reservoir;
delete eclipseCase;
return false;
}
m_rigReservoir = reservoir;
m_rigReservoir = eclipseCase;
loadAndSyncronizeInputProperties();
}
@@ -372,7 +372,7 @@ void RimInputReservoir::removeProperty(RimInputProperty* inputProperty)
//--------------------------------------------------------------------------------------------------
cvf::ref<RifReaderInterface> RimInputReservoir::createMockModel(QString modelName)
{
cvf::ref<RigReservoir> reservoir = new RigReservoir;
cvf::ref<RigEclipseCase> reservoir = new RigEclipseCase;
cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel;
if (modelName == "Input Mock Debug Model Simple")