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 
p4#: 20515
This commit is contained in:
Magne Sjaastad
2013-02-14 10:19:27 +01:00
parent b1531c5454
commit 46cb61e859
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp
View File

@@ -72,17 +72,17 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames)
if (caseName().contains("Input Mock Debug Model"))
{
cvf::ref<RifReaderInterface> readerInterface = this->createMockModel(this->caseName());
m_rigReservoir->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
m_rigReservoir->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
m_rigEclipseCase->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
m_rigEclipseCase->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
m_rigReservoir->activeCellInfo()->computeDerivedData();
m_rigEclipseCase->activeCellInfo()->computeDerivedData();
return;
}
if (m_rigReservoir.isNull())
if (m_rigEclipseCase.isNull())
{
m_rigReservoir = new RigEclipseCase;
m_rigEclipseCase = new RigEclipseCase;
}
// First find and read the grid data
@@ -94,8 +94,8 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames)
{
m_gridFileName = filenames[i];
m_rigReservoir->computeCachedData();
m_rigReservoir->mainGrid()->computeCachedData();
m_rigEclipseCase->computeCachedData();
m_rigEclipseCase->mainGrid()->computeCachedData();
break;
}
@@ -157,7 +157,7 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames)
bool RimInputReservoir::openEclipseGridFile()
{
// Early exit if reservoir data is created
if (m_rigReservoir.isNull())
if (m_rigEclipseCase.isNull())
{
cvf::ref<RifReaderInterface> readerInterface;
@@ -174,25 +174,25 @@ bool RimInputReservoir::openEclipseGridFile()
return false;
}
m_rigReservoir = eclipseCase;
m_rigEclipseCase = eclipseCase;
loadAndSyncronizeInputProperties();
}
CVF_ASSERT(m_rigReservoir.notNull());
CVF_ASSERT(m_rigEclipseCase.notNull());
CVF_ASSERT(readerInterface.notNull());
m_rigReservoir->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
m_rigReservoir->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
m_rigReservoir->computeCachedData();
m_rigReservoir->mainGrid()->computeCachedData();
m_rigEclipseCase->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
m_rigEclipseCase->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
m_rigEclipseCase->computeCachedData();
m_rigEclipseCase->mainGrid()->computeCachedData();
}
RIApplication* app = RIApplication::instance();
if (app->preferences()->autocomputeDepthRelatedProperties)
{
RigReservoirCellResults* matrixResults = m_rigReservoir->results(RifReaderInterface::MATRIX_RESULTS);
RigReservoirCellResults* fractureResults = m_rigReservoir->results(RifReaderInterface::FRACTURE_RESULTS);
RigReservoirCellResults* matrixResults = m_rigEclipseCase->results(RifReaderInterface::MATRIX_RESULTS);
RigReservoirCellResults* fractureResults = m_rigEclipseCase->results(RifReaderInterface::FRACTURE_RESULTS);
matrixResults->computeDepthRelatedResults();
fractureResults->computeDepthRelatedResults();
@@ -210,7 +210,7 @@ void RimInputReservoir::loadAndSyncronizeInputProperties()
{
// Make sure we actually have reservoir data
CVF_ASSERT(m_rigReservoir.notNull());
CVF_ASSERT(m_rigEclipseCase.notNull());
CVF_ASSERT(this->reservoirData()->mainGrid()->gridPointDimensions() != cvf::Vec3st(0,0,0));
// Then read the properties from all the files referenced by the InputReservoir
@@ -359,7 +359,7 @@ void RimInputReservoir::removeProperty(RimInputProperty* inputProperty)
}
// Remove the results pointed to by this input property
RigReservoirCellResults* results = m_rigReservoir->results(RifReaderInterface::MATRIX_RESULTS);
RigReservoirCellResults* results = m_rigEclipseCase->results(RifReaderInterface::MATRIX_RESULTS);
results->removeResult(inputProperty->resultName);
this->removeResult(inputProperty->resultName);
@@ -400,7 +400,7 @@ cvf::ref<RifReaderInterface> RimInputReservoir::createMockModel(QString modelNam
m_inputPropertyCollection->inputProperties.push_back(inputProperty);
}
m_rigReservoir = reservoir;
m_rigEclipseCase = reservoir;
return mockFileInterface.p();
}

12
ApplicationCode/ProjectDataModel/RimReservoir.cpp
View File

@@ -39,7 +39,7 @@
//--------------------------------------------------------------------------------------------------
RimReservoir::RimReservoir()
{
m_rigReservoir = NULL;
m_rigEclipseCase = NULL;
CAF_PDM_InitField(&caseName, "CaseName", QString(), "Case name", "", "" ,"");
// CAF_PDM_InitField(&releaseResultMemory, "ReleaseResultMemory", true, "Release result memory", "", "" ,"");
@@ -55,7 +55,7 @@ RimReservoir::RimReservoir()
//--------------------------------------------------------------------------------------------------
RigEclipseCase* RimReservoir::reservoirData()
{
return m_rigReservoir.p();
return m_rigEclipseCase.p();
}
//--------------------------------------------------------------------------------------------------
@@ -63,7 +63,7 @@ RigEclipseCase* RimReservoir::reservoirData()
//--------------------------------------------------------------------------------------------------
const RigEclipseCase* RimReservoir::reservoirData() const
{
return m_rigReservoir.p();
return m_rigEclipseCase.p();
}
//--------------------------------------------------------------------------------------------------
@@ -187,7 +187,7 @@ void RimReservoir::fieldChangedByUi(const caf::PdmFieldHandle* changedField, con
{
if (changedField == &releaseResultMemory)
{
if (m_rigReservoir.notNull())
if (m_rigEclipseCase.notNull())
{
for (size_t i = 0; i < reservoirViews().size(); i++)
{
@@ -209,13 +209,13 @@ void RimReservoir::fieldChangedByUi(const caf::PdmFieldHandle* changedField, con
reservoirView->createDisplayModelAndRedraw();
}
RigReservoirCellResults* matrixModelResults = m_rigReservoir->results(RifReaderInterface::MATRIX_RESULTS);
RigReservoirCellResults* matrixModelResults = m_rigEclipseCase->results(RifReaderInterface::MATRIX_RESULTS);
if (matrixModelResults)
{
matrixModelResults->clearAllResults();
}
RigReservoirCellResults* fractureModelResults = m_rigReservoir->results(RifReaderInterface::FRACTURE_RESULTS);
RigReservoirCellResults* fractureModelResults = m_rigEclipseCase->results(RifReaderInterface::FRACTURE_RESULTS);
if (fractureModelResults)
{
fractureModelResults->clearAllResults();

8
ApplicationCode/ProjectDataModel/RimReservoir.h
View File

@@ -46,8 +46,8 @@ public:
virtual bool openEclipseGridFile() = 0;
RigEclipseCase* reservoirData();
const RigEclipseCase* reservoirData() const;
RigEclipseCase* reservoirData();
const RigEclipseCase* reservoirData() const;
RimReservoirView* createAndAddReservoirView();
void removeReservoirView(RimReservoirView* reservoirView);
@@ -62,7 +62,7 @@ public:
virtual caf::PdmFieldHandle* userDescriptionField() { return &caseName; }
virtual QString locationOnDisc() const { return QString(); }
virtual QString locationOnDisc() const { return QString(); }
protected:
// Overridden methods
@@ -71,6 +71,6 @@ protected:
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
protected:
cvf::ref<RigEclipseCase> m_rigReservoir;
cvf::ref<RigEclipseCase> m_rigEclipseCase;
};

16
ApplicationCode/ProjectDataModel/RimResultReservoir.cpp
View File

@@ -50,7 +50,7 @@ bool RimResultReservoir::openEclipseGridFile()
progInfo.setProgressDescription("Open Grid File");
progInfo.setNextProgressIncrement(48);
// Early exit if reservoir data is created
if (m_rigReservoir.notNull()) return true;
if (m_rigEclipseCase.notNull()) return true;
cvf::ref<RifReaderInterface> readerInterface;
@@ -58,8 +58,8 @@ bool RimResultReservoir::openEclipseGridFile()
{
readerInterface = this->createMockModel(this->caseName());
m_rigReservoir->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
m_rigReservoir->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
m_rigEclipseCase->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
m_rigEclipseCase->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
}
else
{
@@ -76,20 +76,20 @@ bool RimResultReservoir::openEclipseGridFile()
return false;
}
m_rigReservoir = eclipseCase;
m_rigEclipseCase = eclipseCase;
}
progInfo.incrementProgress();
CVF_ASSERT(m_rigReservoir.notNull());
CVF_ASSERT(m_rigEclipseCase.notNull());
CVF_ASSERT(readerInterface.notNull());
progInfo.setProgressDescription("Computing Faults");
m_rigReservoir->computeCachedData();
m_rigEclipseCase->computeCachedData();
progInfo.incrementProgress();
progInfo.setProgressDescription("Computing Cache");
m_rigReservoir->mainGrid()->computeCachedData();
m_rigEclipseCase->mainGrid()->computeCachedData();
return true;
}
@@ -163,7 +163,7 @@ cvf::ref<RifReaderInterface> RimResultReservoir::createMockModel(QString modelNa
}
m_rigReservoir = reservoir;
m_rigEclipseCase = reservoir;
return mockFileInterface.p();
}