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 class RimResultCase to RimEclipseResultCase

Browse Source
This commit is contained in:
Pål Hagen
2015-06-25 11:56:18 +02:00
parent 9049a47871
commit 051ab1ea24
6 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -634,7 +634,7 @@ bool RiaApplication::openEclipseCaseFromFile(const QString& fileName)
//--------------------------------------------------------------------------------------------------
bool RiaApplication::openEclipseCase(const QString& caseName, const QString& caseFileName)
{
RimResultCase* rimResultReservoir = new RimResultCase();
RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo(caseName, caseFileName);
RimAnalysisModels* analysisModels = m_project->activeOilField() ? m_project->activeOilField()->analysisModels() : NULL;
@@ -1777,7 +1777,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
// 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
RimResultCase* mainResultCase = NULL;
RimEclipseResultCase* mainResultCase = NULL;
std::vector< std::vector<int> > mainCaseGridDimensions;
RimIdenticalGridCaseGroup* gridCaseGroup = NULL;
@@ -1787,7 +1787,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
QString caseName = gridFileName.completeBaseName();
RimResultCase* rimResultReservoir = new RimResultCase();
RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo(caseName, firstFileName);
if (!rimResultReservoir->openEclipseGridFile())
{
@@ -1815,7 +1815,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
QString caseName = gridFileName.completeBaseName();
RimResultCase* rimResultReservoir = new RimResultCase();
RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo(caseName, caseFileName);
std::vector< std::vector<int> > caseGridDimensions;

4
ApplicationCode/Application/RiaProjectModifier.cpp
View File

@@ -164,7 +164,7 @@ bool RiaProjectModifier::replaceSourceCases(RimProject* project)
QString caseName = caseNameFromGridFileName(fileName);
// Use this slightly hackish method in order to get a new unique ID
RimResultCase* resCase = new RimResultCase;
RimEclipseResultCase* resCase = new RimEclipseResultCase;
resCase->setCaseInfo(caseName, fileName);
caseCollection->reservoirs.push_back(resCase);
@@ -196,7 +196,7 @@ bool RiaProjectModifier::replaceCase(RimProject* project)
for (size_t caseIdx = 0; caseIdx < allCases.size(); ++caseIdx)
{
RimResultCase* resultCase = dynamic_cast<RimResultCase*>(allCases[caseIdx]);
RimEclipseResultCase* resultCase = dynamic_cast<RimEclipseResultCase*>(allCases[caseIdx]);
if (resultCase)
{
if (m_replaceCase_caseId == FIRST_OCCURENCE ||