diff --git a/dune/solvers/transferoperators/mandelobsrestrictor.hh b/dune/solvers/transferoperators/mandelobsrestrictor.hh index e5da0a9d30b338db1f4e4e9b5a5156878ed9aabe..44d6ccc2fe68c763366e99f3c46540cab9616224 100644 --- a/dune/solvers/transferoperators/mandelobsrestrictor.hh +++ b/dune/solvers/transferoperators/mandelobsrestrictor.hh @@ -1,17 +1,17 @@ -#ifndef MANDEL_OBSTACLE_RESTRICTOR_HH -#define MANDEL_OBSTACLE_RESTRICTOR_HH +#ifndef DUNE_SOLVERS_TRANSFEROPERATORS_MANDEL_OBSTACLE_RESTRICTOR_HH +#define DUNE_SOLVERS_TRANSFEROPERATORS_MANDEL_OBSTACLE_RESTRICTOR_HH #include <dune/common/bitsetvector.hh> #include <dune/solvers/transferoperators/obstaclerestrictor.hh> #include <dune/solvers/transferoperators/multigridtransfer.hh> #include <dune/solvers/common/boxconstraint.hh> -template <class DiscFuncType> -class MandelObstacleRestrictor : public ObstacleRestrictor<DiscFuncType> +template <class VectorType> +class MandelObstacleRestrictor : public ObstacleRestrictor<VectorType> { - typedef typename DiscFuncType::field_type field_type; + typedef typename VectorType::field_type field_type; - enum {blocksize = DiscFuncType::block_type::dimension}; + enum {blocksize = VectorType::block_type::dimension}; public: @@ -19,7 +19,7 @@ public: std::vector<BoxConstraint<field_type,blocksize> >& t, const Dune::BitSetVector<blocksize>& fHasObstacle, const Dune::BitSetVector<blocksize>& tHasObstacle, - const MultigridTransfer<DiscFuncType>& transfer, + const MultigridTransfer<VectorType>& transfer, const Dune::BitSetVector<blocksize>& critical); };