From fbd1b01469172cd3d84daadee036d26afb056885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kl=C3=B6fkorn?= <robertk@dune-project.org>
Date: Wed, 26 Oct 2005 16:03:08 +0000
Subject: [PATCH] removed index,globalIndex, and subIndex.
also forgot to delete sichCache in Grid Desctructor.
[[Imported from SVN: r3313]]
---
grid/albertagrid/agrid.hh | 17 --------------
grid/albertagrid/albertagrid.cc | 39 +--------------------------------
2 files changed, 1 insertion(+), 55 deletions(-)
diff --git a/grid/albertagrid/agrid.hh b/grid/albertagrid/agrid.hh
index 401163404..0d0ce3329 100644
--- a/grid/albertagrid/agrid.hh
+++ b/grid/albertagrid/agrid.hh
@@ -441,16 +441,9 @@ namespace Dune
//! level of this element
int level () const;
- //! index is unique and consecutive per level and codim
- //! used for access to degrees of freedom
- int index () const DUNE_DEPRECATED;
-
//! index of the boundary which is associated with the entity, 0 for inner entities
int boundaryId () const ;
- //! return the global unique index in grid
- int globalIndex() const DUNE_DEPRECATED;
-
AlbertaGridEntity(const GridImp &grid, int level,
ALBERTA TRAVERSE_STACK * travStack);
@@ -599,12 +592,6 @@ namespace Dune
//! level of this element
int level () const;
- //! index is unique and consecutive per level and codim used for access to degrees of freedo
- int index () const DUNE_DEPRECATED;
-
- //! return the global unique index in grid , same as el_index
- int globalIndex() const DUNE_DEPRECATED;
-
//! index of the boundary which is associated with the entity, 0 for inner entities
int boundaryId () const;
@@ -617,10 +604,6 @@ namespace Dune
//!< Default codim 1 Faces and codim == dim Vertices
template<int cc> int count () const;
- //! return index of sub entity with codim = cc and local number i
- //! i.e. return global number of vertex i
- template<int cc> int subIndex (int i) const DUNE_DEPRECATED;
-
//! Provide access to mesh entity i of given codimension. Entities
//! are numbered 0 ... count<cc>()-1
template<int cc> typename Codim<cc>::EntityPointer entity (int i) const;
diff --git a/grid/albertagrid/albertagrid.cc b/grid/albertagrid/albertagrid.cc
index 01a117ff9..0bce4d477 100644
--- a/grid/albertagrid/albertagrid.cc
+++ b/grid/albertagrid/albertagrid.cc
@@ -744,14 +744,6 @@ namespace Dune
return level_;
}
- template<int codim, int dim, class GridImp>
- inline int AlbertaGridEntity<codim,dim,GridImp>::
- index() const
- {
- const Entity en (*this);
- return grid_.levelIndexSet(en.level()).index(en);
- }
-
// default
template <class GridImp, int codim, int cdim>
struct AlbertaGridBoundaryId
@@ -841,13 +833,6 @@ namespace Dune
{
return AlbertaGridFEVnum<GridImp,codim,GridImp::dimensionworld>::getFEVnum(face_,edge_,vertex_);
}
- template<int codim, int dim, class GridImp>
- inline int AlbertaGridEntity<codim,dim,GridImp>::
- globalIndex() const
- {
- const Entity en (*this);
- return grid_.hierarchicIndexSet().index(en);
- }
template<int cd, int dim, class GridImp>
inline const typename AlbertaGridEntity<cd,dim,GridImp>::Geometry &
@@ -1012,14 +997,6 @@ namespace Dune
}
//*****************************************************************
- // subIndex
- template<int dim, class GridImp> template <int cc>
- inline int AlbertaGridEntity <0,dim,GridImp>::subIndex ( int i ) const
- {
- const Entity en (*this);
- return grid_.hierarchicIndexSet().template subIndex<cc> (en,i);
- }
-
template <class GridImp, int dim, int cd> struct SubEntity;
// specialisation for elements
@@ -1102,21 +1079,6 @@ namespace Dune
return level_;
}
- template<int dim, class GridImp>
- inline int AlbertaGridEntity <0,dim,GridImp>::
- index() const
- {
- const Entity en (*this);
- return grid_.levelIndexSet(level()).index(en);
- }
-
- template<int dim, class GridImp>
- inline int AlbertaGridEntity <0,dim,GridImp>::
- globalIndex() const
- {
- return grid_.getElementNumber( elInfo_->el );
- }
-
template<int dim, class GridImp>
inline void AlbertaGridEntity <0,dim,GridImp>::
setLevel(int actLevel)
@@ -3286,6 +3248,7 @@ namespace Dune
if(dofvecs_.elNewCheck) ALBERTA free_dof_int_vec(dofvecs_.elNewCheck);
if(dofvecs_.owner ) ALBERTA free_dof_int_vec(dofvecs_.owner);
+ if(sizeCache_) delete sizeCache_;sizeCache_ = 0;
#if DIM == 3
if(mesh_)
{
--
GitLab