Removed obsolete code regarding introduction of coarse cells

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

View File

@ -483,48 +483,6 @@ size_t RigGridBase::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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

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

View File

@ -337,38 +337,7 @@ const RigGridBase* RigMainGrid::gridByIndex(size_t localGridIndex) const
CVF_ASSERT(localGridIndex - 1 < m_localGrids.size()) ;
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() ;
}
}
*/
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------