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 obsolete code regarding introduction of coarse cells

Browse Source 
p4#: 20345
This commit is contained in:
Jacob Støren 2013-02-01 15:34:27 +01:00
parent 3c9ac23534
commit 9d9f8d45c0
3 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

@ -483,48 +483,6 @@ size_t RigGridBase::fractureModelActiveCellCount()
{ {
return m_fractureModelActiveCellCount; return m_fractureModelActiveCellCount;
} }
/*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigGridBase::computeMatrixAndFractureModelActiveCellCount()
{
m_matrixModelActiveCellCount = 0;
m_fractureModelActiveCellCount = 0;
size_t higestActiveIndexInMM = 0;
size_t higestActiveIndexInFM = 0;
bool firstMMActiveCell = true;
bool firstFMActiveCell = true;
for (size_t i = 0; i < cellCount(); i++)
{
const RigCell& c = cell(i);
if (c.isActiveInMatrixModel())
{
if (c.activeIndexInMatrixModel() > higestActiveIndexInMM || firstMMActiveCell)
{
m_matrixModelActiveCellCount++;
higestActiveIndexInMM = c.activeIndexInMatrixModel();
firstMMActiveCell = false;
}
}
if (c.isActiveInFractureModel())
{
if (c.activeIndexInFractureModel() > higestActiveIndexInFM || firstFMActiveCell)
{
m_fractureModelActiveCellCount++;
higestActiveIndexInFM = c.activeIndexInFractureModel();
firstFMActiveCell = false;
}
}
}
*/
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -541,10 +499,6 @@ cvf::ref<RigGridScalarDataAccess> RigGridBase::dataAccessObject(RifReaderInterfa
return NULL; return NULL;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ReservoirDataModel/RigGridBase.h
View File

@ -65,7 +65,6 @@ public:
void setMatrixModelActiveCellCount(size_t activeMatrixModelCellCount); void setMatrixModelActiveCellCount(size_t activeMatrixModelCellCount);
size_t fractureModelActiveCellCount(); size_t fractureModelActiveCellCount();
void setFractureModelActiveCellCount(size_t activeFractureModelCellCount); void setFractureModelActiveCellCount(size_t activeFractureModelCellCount);
//void computeMatrixAndFractureModelActiveCellCount();
protected: protected:
friend class RigMainGrid;//::initAllSubGridsParentGridPointer(); friend class RigMainGrid;//::initAllSubGridsParentGridPointer();

31
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@ -337,38 +337,7 @@ const RigGridBase* RigMainGrid::gridByIndex(size_t localGridIndex) const
CVF_ASSERT(localGridIndex - 1 < m_localGrids.size()) ; CVF_ASSERT(localGridIndex - 1 < m_localGrids.size()) ;
return m_localGrids[localGridIndex-1].p(); return m_localGrids[localGridIndex-1].p();
} }
/*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::computeActiveCellCountForAllGrids()
{
computeMatrixAndFractureModelActiveCellCount();
size_t i;
for (i = 0; i < m_localGrids.size(); ++i)
{
m_localGrids[i]->computeMatrixAndFractureModelActiveCellCount();
}
}
*/
/*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::computeGlobalActiveCellCount()
{
m_globalMatrixModelActiveCellCount = this->matrixModelActiveCellCount();
m_globalFractureModelActiveCellCount = this->fractureModelActiveCellCount();
size_t i;
for (i = 0; i < m_localGrids.size(); i++)
{
m_globalMatrixModelActiveCellCount += m_localGrids[i]->matrixModelActiveCellCount() ;
m_globalFractureModelActiveCellCount += m_localGrids[i]->fractureModelActiveCellCount() ;
}
}
*/
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------