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

Removed more functions from MainGrid

Browse Source 
p4#: 20468
This commit is contained in:
Magne Sjaastad
2013-02-12 14:00:39 +01:00
parent 6c7dc10791
commit d45aded7f7
6 changed files with 34 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
View File

@@ -115,11 +115,11 @@ void RimCellRangeFilter::setDefaultValues()
{
CVF_ASSERT(m_parentContainer);
RigMainGrid* mainGrid = m_parentContainer->mainGrid();
if (mainGrid)
RigActiveCellInfo* actCellInfo = m_parentContainer->activeCellInfo();
if (actCellInfo)
{
cvf::Vec3st min, max;
mainGrid->matrixModelActiveCellsBoundingBox(min, max);
actCellInfo->matrixModelActiveCellsBoundingBox(min, max);
// Adjust to Eclipse indexing
min.x() = min.x() + 1;
@@ -159,10 +159,13 @@ void RimCellRangeFilter::defineEditorAttribute(const caf::PdmFieldHandle* field,
}
RigMainGrid* mainGrid = m_parentContainer->mainGrid();
if (mainGrid)
CVF_ASSERT(mainGrid);
RigActiveCellInfo* actCellInfo = m_parentContainer->activeCellInfo();
if (actCellInfo)
{
cvf::Vec3st min, max;
mainGrid->matrixModelActiveCellsBoundingBox(min, max);
actCellInfo->matrixModelActiveCellsBoundingBox(min, max);
// Adjust to Eclipse indexing
min.x() = min.x() + 1;

23
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@@ -97,8 +97,6 @@ void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter*
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -126,9 +124,25 @@ RigMainGrid* RimCellRangeFilterCollection::mainGrid() const
m_reservoirView->eclipseCase()->reservoirData()->mainGrid())
{
RigMainGrid* mainGrid = m_reservoirView->eclipseCase()->reservoirData()->mainGrid();
return m_reservoirView->eclipseCase()->reservoirData()->mainGrid();
}
return mainGrid;
return NULL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigActiveCellInfo* RimCellRangeFilterCollection::activeCellInfo() const
{
if (m_reservoirView &&
m_reservoirView->eclipseCase() &&
m_reservoirView->eclipseCase()->reservoirData() &&
m_reservoirView->eclipseCase()->reservoirData()->activeCellInfo())
{
return m_reservoirView->eclipseCase()->reservoirData()->activeCellInfo();
}
return NULL;
@@ -209,3 +223,4 @@ bool RimCellRangeFilterCollection::hasActiveFilters() const
return false;
}

9
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.h
View File

@@ -20,6 +20,8 @@
#include "RimCellRangeFilter.h"
class RigActiveCellInfo;
//==================================================================================================
///
///
@@ -42,9 +44,10 @@ public:
void compoundCellRangeFilter(cvf::CellRangeFilter* cellRangeFilter) const;
bool hasActiveFilters() const;
void setReservoirView(RimReservoirView* reservoirView);
RimReservoirView* reservoirView();
RigMainGrid* mainGrid() const;
void setReservoirView(RimReservoirView* reservoirView);
RimReservoirView* reservoirView();
RigMainGrid* mainGrid() const;
RigActiveCellInfo* activeCellInfo() const;
// Overridden methods
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );

60
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -24,11 +24,7 @@
#include "cvfAssert.h"
RigMainGrid::RigMainGrid(void)
: RigGridBase(this),
m_activeCellPositionMin(cvf::Vec3st::UNDEFINED),
m_activeCellPositionMax(cvf::Vec3st::UNDEFINED),
m_validCellPositionMin(cvf::Vec3st::UNDEFINED),
m_validCellPositionMax(cvf::Vec3st::UNDEFINED)
: RigGridBase(this)
{
m_matrixModelResults = new RigReservoirCellResults(this);
m_fractureModelResults = new RigReservoirCellResults(this);
@@ -79,15 +75,6 @@ void RigMainGrid::initAllSubCellsMainGridCellIndex()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::matrixModelActiveCellsBoundingBox(cvf::Vec3st& min, cvf::Vec3st& max) const
{
min = m_activeCellPositionMin;
max = m_activeCellPositionMax;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -96,15 +83,6 @@ cvf::BoundingBox RigMainGrid::matrixModelActiveCellsBoundingBox() const
return m_activeCellsBoundingBox;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::validCellsBoundingBox(cvf::Vec3st& min, cvf::Vec3st& max) const
{
min = m_validCellPositionMin;
max = m_validCellPositionMax;
}
//--------------------------------------------------------------------------------------------------
@@ -137,41 +115,6 @@ public:
};
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::computeActiveAndValidCellRanges()
{
CellRangeBB validBB;
CellRangeBB activeBB;
size_t idx;
for (idx = 0; idx < cellCount(); idx++)
{
const RigCell& c = cell(idx);
size_t i, j, k;
ijkFromCellIndex(idx, &i, &j, &k);
if (!c.isInvalid())
{
validBB.add(i, j, k);
}
if (c.isActiveInMatrixModel())
{
activeBB.add(i, j, k);
}
}
m_validCellPositionMin = validBB.m_min;
m_validCellPositionMax = validBB.m_max;
m_activeCellPositionMin = activeBB.m_min;
m_activeCellPositionMax = activeBB.m_max;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -221,7 +164,6 @@ void RigMainGrid::computeCachedData()
{
initAllSubGridsParentGridPointer();
initAllSubCellsMainGridCellIndex();
computeActiveAndValidCellRanges();
computeBoundingBox();
}

8
ApplicationCode/ReservoirDataModel/RigMainGrid.h
View File

@@ -45,9 +45,6 @@ public:
RigReservoirCellResults* results(RifReaderInterface::PorosityModelResultType porosityModel);
const RigReservoirCellResults* results(RifReaderInterface::PorosityModelResultType porosityModel) const;
void matrixModelActiveCellsBoundingBox(cvf::Vec3st& min, cvf::Vec3st& max) const;
void validCellsBoundingBox(cvf::Vec3st& min, cvf::Vec3st& max) const;
void addLocalGrid(RigLocalGrid* localGrid);
size_t gridCount() const { return m_localGrids.size() + 1; }
RigGridBase* gridByIndex(size_t localGridIndex);
@@ -74,11 +71,6 @@ private:
cvf::ref<RigReservoirCellResults> m_matrixModelResults;
cvf::ref<RigReservoirCellResults> m_fractureModelResults;
cvf::Vec3st m_activeCellPositionMin;
cvf::Vec3st m_activeCellPositionMax;
cvf::Vec3st m_validCellPositionMin;
cvf::Vec3st m_validCellPositionMax;
cvf::BoundingBox m_activeCellsBoundingBox;
};

11
ApplicationCode/ReservoirDataModel/RigReservoir.h
View File

@@ -54,17 +54,6 @@ public:
RigActiveCellInfo* activeCellInfo();
/*
// From RigMainGrid, can this function be moved to Octave socket server?
void calculateMatrixModelActiveCellInfo(std::vector<qint32>& gridNumber,
std::vector<qint32>& i,
std::vector<qint32>& j,
std::vector<qint32>& k,
std::vector<qint32>& parentGridNumber,
std::vector<qint32>& hostCellI,
std::vector<qint32>& hostCellJ,
std::vector<qint32>& hostCellK);
*/
private:
void computeFaults();