Commit 965677de authored by Carsten Gräser's avatar Carsten Gräser

Remove indexSet() method on the basis and DefaultGlobalIndexSet

We decided to drop this and add all its methods to the basis directly.
This has been implemented and the removal of the global index
set was announced more than a year ago. Unfortunately it was not
formally marked as deprecated.
parent d361347f
......@@ -6,7 +6,6 @@ install(FILES
compositebasis.hh
concepts.hh
defaultglobalbasis.hh
defaultglobalindexset.hh
defaultlocalindexset.hh
defaultlocalview.hh
defaultnodetorangemap.hh
......
......@@ -8,7 +8,7 @@
#include <dune/common/concept.hh>
#include <dune/functions/common/type_traits.hh>
#include <dune/functions/functionspacebases/defaultglobalindexset.hh>
#include <dune/functions/functionspacebases/defaultlocalindexset.hh>
#include <dune/functions/functionspacebases/defaultlocalview.hh>
#include <dune/functions/functionspacebases/concepts.hh>
......@@ -42,7 +42,6 @@ public:
using NodeIndexSet = typename NodeFactory::template IndexSet<PrefixPath>;
using SizePrefix = typename NodeFactory::SizePrefix;
using LocalIndexSet = DefaultLocalIndexSet<LocalView, NodeIndexSet>;
using GlobalIndexSet = DefaultGlobalIndexSet<LocalView, NodeFactory>;
/** \brief Constructor for a given grid view object */
......@@ -109,11 +108,6 @@ public:
return LocalIndexSet(nodeFactory_.template indexSet<PrefixPath>());
}
GlobalIndexSet indexSet() const
{
return GlobalIndexSet(nodeFactory_);
}
const DefaultGlobalBasis& rootBasis() const
{
return *this;
......
// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
// vi: set et ts=4 sw=2 sts=2:
#ifndef DUNE_FUNCTIONS_FUNCTIONSPACEBASES_DEFAULTGLOBALINDEXSET_HH
#define DUNE_FUNCTIONS_FUNCTIONSPACEBASES_DEFAULTGLOBALINDEXSET_HH
#include <tuple>
#include <dune/functions/functionspacebases/defaultlocalindexset.hh>
namespace Dune {
namespace Functions {
template<class LV, class NF>
class DefaultGlobalIndexSet
{
using RootTreePath = TypeTree::HybridTreePath<>;
public:
using LocalView = LV;
using NodeFactory = NF;
using NodeIndexSet = typename NodeFactory::template IndexSet<RootTreePath>;
using SizePrefix = typename NodeFactory::SizePrefix;
using LocalIndexSet = DefaultLocalIndexSet<LocalView, NodeIndexSet>;
using size_type = typename NodeFactory::size_type;
DefaultGlobalIndexSet(const NodeFactory& nodeFactory) :
nodeFactory_(&nodeFactory)
{}
size_type dimension() const
{
return nodeFactory_->dimension();
}
//! Return number of possible values for next position in empty multi index
size_type size() const
{
return nodeFactory_->size();
}
//! Return number possible values for next position in multi index
size_type size(const SizePrefix& prefix) const
{
return nodeFactory_->size(prefix);
}
LocalIndexSet localIndexSet() const
{
return LocalIndexSet(nodeFactory_->template indexSet<RootTreePath>());
}
private:
const NodeFactory* nodeFactory_;
};
} // end namespace Functions
} // end namespace Dune
#endif // DUNE_FUNCTIONS_FUNCTIONSPACEBASES_DEFAULTGLOBALINDEXSET_HH
......@@ -31,7 +31,6 @@ int main (int argc, char* argv[]) try
const GridView& gridView = grid.leafGridView();
Basis feBasis(gridView);
auto indexSet = feBasis.indexSet();
typedef Basis::MultiIndex MultiIndex;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment