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
Show Stats 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) bool RiaApplication::openEclipseCase(const QString& caseName, const QString& caseFileName)
{ {
RimResultCase* rimResultReservoir = new RimResultCase(); RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo(caseName, caseFileName); rimResultReservoir->setCaseInfo(caseName, caseFileName);
RimAnalysisModels* analysisModels = m_project->activeOilField() ? m_project->activeOilField()->analysisModels() : NULL; 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. // First file is read completely including grid.
// The main grid from the first case is reused directly in for the other cases. // 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 // 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; std::vector< std::vector<int> > mainCaseGridDimensions;
RimIdenticalGridCaseGroup* gridCaseGroup = NULL; RimIdenticalGridCaseGroup* gridCaseGroup = NULL;
@ -1787,7 +1787,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
QString caseName = gridFileName.completeBaseName(); QString caseName = gridFileName.completeBaseName();
RimResultCase* rimResultReservoir = new RimResultCase(); RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo(caseName, firstFileName); rimResultReservoir->setCaseInfo(caseName, firstFileName);
if (!rimResultReservoir->openEclipseGridFile()) if (!rimResultReservoir->openEclipseGridFile())
{ {
@ -1815,7 +1815,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
QString caseName = gridFileName.completeBaseName(); QString caseName = gridFileName.completeBaseName();
RimResultCase* rimResultReservoir = new RimResultCase(); RimEclipseResultCase* rimResultReservoir = new RimEclipseResultCase();
rimResultReservoir->setCaseInfo(caseName, caseFileName); rimResultReservoir->setCaseInfo(caseName, caseFileName);
std::vector< std::vector<int> > caseGridDimensions; 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); QString caseName = caseNameFromGridFileName(fileName);
// Use this slightly hackish method in order to get a new unique ID // 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); resCase->setCaseInfo(caseName, fileName);
caseCollection->reservoirs.push_back(resCase); caseCollection->reservoirs.push_back(resCase);
@ -196,7 +196,7 @@ bool RiaProjectModifier::replaceCase(RimProject* project)
for (size_t caseIdx = 0; caseIdx < allCases.size(); ++caseIdx) 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 (resultCase)
{ {
if (m_replaceCase_caseId == FIRST_OCCURENCE || if (m_replaceCase_caseId == FIRST_OCCURENCE ||

4
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@ -179,7 +179,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
caf::ProgressInfo info(caseCollection()->reservoirs.size(), "Case group - Reading Active Cell data"); caf::ProgressInfo info(caseCollection()->reservoirs.size(), "Case group - Reading Active Cell data");
for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++) for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++)
{ {
RimResultCase* rimReservoir = dynamic_cast<RimResultCase*>(caseCollection()->reservoirs[i]); RimEclipseResultCase* rimReservoir = dynamic_cast<RimEclipseResultCase*>(caseCollection()->reservoirs[i]);
if(!rimReservoir) continue; // Input reservoir if(!rimReservoir) continue; // Input reservoir
if (!rimReservoir->openAndReadActiveCellData(rigCaseData)) if (!rimReservoir->openAndReadActiveCellData(rigCaseData))
@ -227,7 +227,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++) for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++)
{ {
RimResultCase* rimReservoir = dynamic_cast<RimResultCase*>(caseCollection()->reservoirs[i]); RimEclipseResultCase* rimReservoir = dynamic_cast<RimEclipseResultCase*>(caseCollection()->reservoirs[i]);
if (!rimReservoir) continue; // Input reservoir if (!rimReservoir) continue; // Input reservoir
RimReservoirCellResultsStorage* cellResultsStorage = rimReservoir->results(poroModel); RimReservoirCellResultsStorage* cellResultsStorage = rimReservoir->results(poroModel);

26
ApplicationCode/ProjectDataModel/RimResultCase.cpp
View File

@ -39,11 +39,11 @@
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase"); CAF_PDM_SOURCE_INIT(RimEclipseResultCase, "EclipseCase");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimResultCase::RimResultCase() RimEclipseResultCase::RimEclipseResultCase()
: RimEclipseCase() : RimEclipseCase()
{ {
CAF_PDM_InitObject("Eclipse Case", ":/Case48x48.png", "", ""); CAF_PDM_InitObject("Eclipse Case", ":/Case48x48.png", "", "");
@ -68,7 +68,7 @@ RimResultCase::RimResultCase()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimResultCase::openEclipseGridFile() bool RimEclipseResultCase::openEclipseGridFile()
{ {
caf::ProgressInfo progInfo(50, "Reading Eclipse Grid File"); caf::ProgressInfo progInfo(50, "Reading Eclipse Grid File");
@ -127,7 +127,7 @@ bool RimResultCase::openEclipseGridFile()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase) bool RimEclipseResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase)
{ {
// Early exit if data is already read // Early exit if data is already read
if (m_activeCellInfoIsReadFromFile) return true; if (m_activeCellInfoIsReadFromFile) return true;
@ -187,7 +187,7 @@ bool RimResultCase::openAndReadActiveCellData(RigCaseData* mainEclipseCase)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RifReaderInterface> RimResultCase::createMockModel(QString modelName) cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel(QString modelName)
{ {
cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel; cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel;
cvf::ref<RigCaseData> reservoir = new RigCaseData; cvf::ref<RigCaseData> reservoir = new RigCaseData;
@ -291,7 +291,7 @@ cvf::ref<RifReaderInterface> RimResultCase::createMockModel(QString modelName)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimResultCase::~RimResultCase() RimEclipseResultCase::~RimEclipseResultCase()
{ {
reservoirViews.deleteAllChildObjects(); reservoirViews.deleteAllChildObjects();
} }
@ -299,7 +299,7 @@ RimResultCase::~RimResultCase()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimResultCase::locationOnDisc() const QString RimEclipseResultCase::locationOnDisc() const
{ {
QFileInfo fi(caseFileName()); QFileInfo fi(caseFileName());
return fi.absolutePath(); return fi.absolutePath();
@ -308,7 +308,7 @@ QString RimResultCase::locationOnDisc() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimResultCase::readGridDimensions(std::vector< std::vector<int> >& gridDimensions) void RimEclipseResultCase::readGridDimensions(std::vector< std::vector<int> >& gridDimensions)
{ {
RifEclipseOutputFileTools::readGridDimensions(caseFileName(), gridDimensions); RifEclipseOutputFileTools::readGridDimensions(caseFileName(), gridDimensions);
} }
@ -316,7 +316,7 @@ void RimResultCase::readGridDimensions(std::vector< std::vector<int> >& gridDime
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimResultCase::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) void RimEclipseResultCase::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath)
{ {
bool foundFile = false; bool foundFile = false;
std::vector<QString> searchedPaths; std::vector<QString> searchedPaths;
@ -335,7 +335,7 @@ void RimResultCase::updateFilePathsFromProjectPath(const QString& newProjectPath
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimResultCase::setGridFileName(const QString& caseFileName) void RimEclipseResultCase::setGridFileName(const QString& caseFileName)
{ {
this->caseFileName = caseFileName; this->caseFileName = caseFileName;
} }
@ -344,7 +344,7 @@ void RimResultCase::setGridFileName(const QString& caseFileName)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimResultCase::setCaseInfo(const QString& userDescription, const QString& caseFileName) void RimEclipseResultCase::setCaseInfo(const QString& userDescription, const QString& caseFileName)
{ {
this->caseUserDescription = userDescription; this->caseUserDescription = userDescription;
this->caseFileName = caseFileName; this->caseFileName = caseFileName;
@ -356,7 +356,7 @@ void RimResultCase::setCaseInfo(const QString& userDescription, const QString& c
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimResultCase::initAfterRead() void RimEclipseResultCase::initAfterRead()
{ {
RimEclipseCase::initAfterRead(); RimEclipseCase::initAfterRead();
@ -373,7 +373,7 @@ void RimResultCase::initAfterRead()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimEclipseResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
uiOrdering.add(&caseUserDescription); uiOrdering.add(&caseUserDescription);
uiOrdering.add(&caseId); uiOrdering.add(&caseId);

6
ApplicationCode/ProjectDataModel/RimResultCase.h
View File

@ -30,13 +30,13 @@ class RigMainGrid;
// //
// //
//================================================================================================== //==================================================================================================
class RimResultCase : public RimEclipseCase class RimEclipseResultCase : public RimEclipseCase
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimResultCase(); RimEclipseResultCase();
virtual ~RimResultCase(); virtual ~RimEclipseResultCase();
void setGridFileName(const QString& caseFileName); void setGridFileName(const QString& caseFileName);
void setCaseInfo(const QString& userDescription, const QString& caseFileName); void setCaseInfo(const QString& userDescription, const QString& caseFileName);

16
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@ -639,7 +639,7 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO
RimIdenticalGridCaseGroup* gridCaseGroup = gridCaseGroupFromItemIndex(itemIndex); RimIdenticalGridCaseGroup* gridCaseGroup = gridCaseGroupFromItemIndex(itemIndex);
if (gridCaseGroup) if (gridCaseGroup)
{ {
std::vector<caf::PdmPointer<RimResultCase> > typedObjects; std::vector<caf::PdmPointer<RimEclipseResultCase> > typedObjects;
pdmObjects.createCopyByType(&typedObjects); pdmObjects.createCopyByType(&typedObjects);
if (typedObjects.size() == 0) if (typedObjects.size() == 0)
@ -647,24 +647,24 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO
return; return;
} }
RimResultCase* mainResultCase = NULL; RimEclipseResultCase* mainResultCase = NULL;
std::vector< std::vector<int> > mainCaseGridDimensions; std::vector< std::vector<int> > mainCaseGridDimensions;
// Read out main grid and main grid dimensions if present in case group // Read out main grid and main grid dimensions if present in case group
if (gridCaseGroup->mainCase()) if (gridCaseGroup->mainCase())
{ {
mainResultCase = dynamic_cast<RimResultCase*>(gridCaseGroup->mainCase()); mainResultCase = dynamic_cast<RimEclipseResultCase*>(gridCaseGroup->mainCase());
CVF_ASSERT(mainResultCase); CVF_ASSERT(mainResultCase);
mainResultCase->readGridDimensions(mainCaseGridDimensions); mainResultCase->readGridDimensions(mainCaseGridDimensions);
} }
std::vector<RimResultCase*> insertedCases; std::vector<RimEclipseResultCase*> insertedCases;
// Add cases to case group // Add cases to case group
for (size_t i = 0; i < typedObjects.size(); i++) for (size_t i = 0; i < typedObjects.size(); i++)
{ {
RimResultCase* rimResultReservoir = typedObjects[i]; RimEclipseResultCase* rimResultReservoir = typedObjects[i];
proj->assignCaseIdToCase(rimResultReservoir); proj->assignCaseIdToCase(rimResultReservoir);
@ -679,14 +679,14 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, const caf::PdmO
// Initialize the new objects // Initialize the new objects
for (size_t i = 0; i < insertedCases.size(); i++) for (size_t i = 0; i < insertedCases.size(); i++)
{ {
RimResultCase* rimResultReservoir = insertedCases[i]; RimEclipseResultCase* rimResultReservoir = insertedCases[i];
caf::PdmDocument::initAfterReadTraversal(rimResultReservoir); caf::PdmDocument::initAfterReadTraversal(rimResultReservoir);
} }
// Load stuff // Load stuff
for (size_t i = 0; i < insertedCases.size(); i++) for (size_t i = 0; i < insertedCases.size(); i++)
{ {
RimResultCase* rimResultReservoir = insertedCases[i]; RimEclipseResultCase* rimResultReservoir = insertedCases[i];
if (!mainResultCase) if (!mainResultCase)
@ -786,7 +786,7 @@ void RimUiTreeModelPdm::moveObjects(const QModelIndex& itemIndex, caf::PdmObject
addObjects(itemIndex, pdmObjects); addObjects(itemIndex, pdmObjects);
// Delete objects from original container // Delete objects from original container
std::vector<caf::PdmPointer<RimResultCase> > typedObjects; std::vector<caf::PdmPointer<RimEclipseResultCase> > typedObjects;
pdmObjects.objectsByType(&typedObjects); pdmObjects.objectsByType(&typedObjects);
for (size_t i = 0; i < typedObjects.size(); i++) for (size_t i = 0; i < typedObjects.size(); i++)