OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-26 21:27:15 -05: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
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp
+7 -7
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")
ApplicationCode/ProjectDataModel/RimReservoir.cpp
+2 -2
View File
@@ -53,7 +53,7 @@ RimReservoir::RimReservoir()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigReservoir* RimReservoir::reservoirData()
RigEclipseCase* RimReservoir::reservoirData()
{
return m_rigReservoir.p();
}
@@ -61,7 +61,7 @@ RigReservoir* RimReservoir::reservoirData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RigReservoir* RimReservoir::reservoirData() const
const RigEclipseCase* RimReservoir::reservoirData() const
{
return m_rigReservoir.p();
}
ApplicationCode/ProjectDataModel/RimReservoir.h
+4 -4
View File
@@ -26,7 +26,7 @@
class QString;
class RigReservoir;
class RigEclipseCase;
class RigGridBase;
class RimReservoirView;
@@ -46,8 +46,8 @@ public:
virtual bool openEclipseGridFile() = 0;
RigReservoir* reservoirData();
const RigReservoir* reservoirData() const;
RigEclipseCase* reservoirData();
const RigEclipseCase* reservoirData() const;
RimReservoirView* createAndAddReservoirView();
void removeReservoirView(RimReservoirView* reservoirView);
@@ -71,6 +71,6 @@ protected:
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
protected:
cvf::ref<RigReservoir> m_rigReservoir;
cvf::ref<RigEclipseCase> m_rigReservoir;
};
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+12 -12
View File
@@ -835,20 +835,20 @@ bool RimReservoirView::pickInfo(size_t gridIndex, size_t cellIndex, const cvf::V
if (m_reservoir)
{
const RigReservoir* reservoir = m_reservoir->reservoirData();
if (reservoir)
const RigEclipseCase* eclipseCase = m_reservoir->reservoirData();
if (eclipseCase)
{
size_t i = 0;
size_t j = 0;
size_t k = 0;
if (reservoir->grid(gridIndex)->ijkFromCellIndex(cellIndex, &i, &j, &k))
if (eclipseCase->grid(gridIndex)->ijkFromCellIndex(cellIndex, &i, &j, &k))
{
// Adjust to 1-based Eclipse indexing
i++;
j++;
k++;
cvf::Vec3d domainCoord = point + reservoir->grid(gridIndex)->displayModelOffset();
cvf::Vec3d domainCoord = point + eclipseCase->grid(gridIndex)->displayModelOffset();
pickInfoText->sprintf("Hit grid %u, cell [%u, %u, %u], intersection point: [E: %.2f, N: %.2f, Depth: %.2f]", static_cast<unsigned int>(gridIndex), static_cast<unsigned int>(i), static_cast<unsigned int>(j), static_cast<unsigned int>(k), domainCoord.x(), domainCoord.y(), -domainCoord.z());
return true;
@@ -868,14 +868,14 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
if (m_reservoir && m_reservoir->reservoirData())
{
const RigReservoir* reservoir = m_reservoir->reservoirData();
const RigGridBase* grid = reservoir->grid(gridIndex);
const RigActiveCellInfo* activeCellInfo = reservoir->activeCellInfo();
const RigEclipseCase* eclipseCase = m_reservoir->reservoirData();
const RigGridBase* grid = eclipseCase->grid(gridIndex);
const RigActiveCellInfo* activeCellInfo = eclipseCase->activeCellInfo();
if (this->cellResult()->hasResult())
{
RifReaderInterface::PorosityModelResultType porosityModel = RigReservoirCellResults::convertFromProjectModelPorosityModel(cellResult()->porosityModel());
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObject = reservoir->dataAccessObject(grid, porosityModel, m_currentTimeStep, this->cellResult()->gridScalarIndex());
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObject = eclipseCase->dataAccessObject(grid, porosityModel, m_currentTimeStep, this->cellResult()->gridScalarIndex());
if (dataAccessObject.notNull())
{
double scalarValue = dataAccessObject->cellScalar(cellIndex);
@@ -896,7 +896,7 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
// Cell edge results are static, results are loaded for first time step only
RifReaderInterface::PorosityModelResultType porosityModel = RigReservoirCellResults::convertFromProjectModelPorosityModel(cellResult()->porosityModel());
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObject = reservoir->dataAccessObject(grid, porosityModel, 0, resultIndices[idx]);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObject = eclipseCase->dataAccessObject(grid, porosityModel, 0, resultIndices[idx]);
if (dataAccessObject.notNull())
{
double scalarValue = dataAccessObject->cellScalar(cellIndex);
@@ -1034,11 +1034,11 @@ void RimReservoirView::updateLegends()
return;
}
RigReservoir* reservoir = m_reservoir->reservoirData();
CVF_ASSERT(reservoir);
RigEclipseCase* eclipseCase = m_reservoir->reservoirData();
CVF_ASSERT(eclipseCase);
RifReaderInterface::PorosityModelResultType porosityModel = RigReservoirCellResults::convertFromProjectModelPorosityModel(cellResult()->porosityModel());
RigReservoirCellResults* results = reservoir->results(porosityModel);
RigReservoirCellResults* results = eclipseCase->results(porosityModel);
CVF_ASSERT(results);
if (this->cellResult()->hasResult())
ApplicationCode/ProjectDataModel/RimResultReservoir.cpp
+5 -5
View File
@@ -69,15 +69,15 @@ bool RimResultReservoir::openEclipseGridFile()
return false;
}
RigReservoir* reservoir = new RigReservoir;
RigEclipseCase* eclipseCase = new RigEclipseCase;
readerInterface = new RifReaderEclipseOutput;
if (!readerInterface->open(fname, reservoir))
if (!readerInterface->open(fname, eclipseCase))
{
delete reservoir;
delete eclipseCase;
return false;
}
m_rigReservoir = reservoir;
m_rigReservoir = eclipseCase;
}
progInfo.incrementProgress();
@@ -102,7 +102,7 @@ bool RimResultReservoir::openEclipseGridFile()
cvf::ref<RifReaderInterface> RimResultReservoir::createMockModel(QString modelName)
{
cvf::ref<RifReaderMockModel> mockFileInterface = new RifReaderMockModel;
cvf::ref<RigReservoir> reservoir = new RigReservoir;
cvf::ref<RigEclipseCase> reservoir = new RigEclipseCase;
if (modelName == "Result Mock Debug Model Simple")
{