Skip to content
Snippets Groups Projects
Commit 365c06e1 authored by Oliver Sander's avatar Oliver Sander
Browse files

new traits concept, 2st attemp

[[Imported from SVN: r2863]]
parent c137125e
Branches
Tags
No related merge requests found
......@@ -106,9 +106,9 @@ namespace Dune {
UGGridLevelIndexSet<dim>,
UGGridLeafIndexSet<dim>,
UGGridGlobalIdSet< UGGrid<dim,dimworld> >,
typename UGGridGlobalIdSet< UGGrid<dim,dimworld> >::GlobalIdType,
unsigned int,
UGGridLocalIdSet<dim>,
typename UGGridLocalIdSet<dim>::LocalIdType> Traits;
unsigned int> Traits;
};
......@@ -215,10 +215,10 @@ namespace Dune {
typedef UGGridLevelIndexSet<dim> LevelIndexSet;
#endif
typedef UGGridLeafIndexSet<dim> LeafIndexSet;
typedef UGGridGlobalIdSet< UGGrid<dim, dimworld> > GlobalIdSet;
typedef UGGridLocalIdSet<dim> LocalIdSet;
#endif
typedef typename UGGridFamily<dim,dimworld>::Traits Traits;
......@@ -314,13 +314,13 @@ namespace Dune {
}
/** \brief Access to the GlobalIdSet */
const GlobalIdSet& globalIdSet() const
const typename Traits::GlobalIdSet& globalIdSet() const
{
return globalIdSet_;
}
/** \brief Access to the LocalIdSet */
const LocalIdSet& localIdSet() const
const typename Traits::LocalIdSet& localIdSet() const
{
return localIdSet_;
}
......@@ -333,7 +333,7 @@ namespace Dune {
}
/** \brief Access to the LeafIndexSet */
const LeafIndexSet& leafIndexSet() const
const typename Traits::LeafIndexSet& leafIndexSet() const
{
return leafIndexSet_;
}
......@@ -511,11 +511,11 @@ namespace Dune {
// Our set of level indices
std::vector<typename Traits::LevelIndexSet> levelIndexSets_;
LeafIndexSet leafIndexSet_;
typename Traits::LeafIndexSet leafIndexSet_;
GlobalIdSet globalIdSet_;
typename Traits::GlobalIdSet globalIdSet_;
LocalIdSet localIdSet_;
typename Traits::LocalIdSet localIdSet_;
//! Marks whether the UG environment heap size is taken from
//! an existing defaults file or whether the values from
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment