diff --git a/dune/gdt/spaces/fv/default.hh b/dune/gdt/spaces/fv/default.hh index 048ea840f8a8a940d542ef945ae0071312a3b7f3..95953739194f53f8e8ffb4af2ce54aeeb3c04883 100644 --- a/dune/gdt/spaces/fv/default.hh +++ b/dune/gdt/spaces/fv/default.hh @@ -61,12 +61,12 @@ public: template <class GridViewImp, class RangeFieldImp, size_t rangeDim> class Default<GridViewImp, RangeFieldImp, rangeDim, 1> - : public FVInterface<internal::DefaultTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, GridViewImp::dimension, - rangeDim, 1> + : public FvSpaceInterface<internal::DefaultTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, GridViewImp::dimension, + rangeDim, 1> { typedef Default<GridViewImp, RangeFieldImp, rangeDim, 1> ThisType; - typedef FVInterface<internal::DefaultTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, GridViewImp::dimension, - rangeDim, 1> BaseType; + typedef FvSpaceInterface<internal::DefaultTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, GridViewImp::dimension, + rangeDim, 1> BaseType; public: typedef typename internal::DefaultTraits<GridViewImp, RangeFieldImp, rangeDim, 1> Traits; diff --git a/dune/gdt/spaces/fv/defaultproduct.hh b/dune/gdt/spaces/fv/defaultproduct.hh index 6a76968c9c9e7f99285204a4c2e095e24ca5c26c..76e1389a582440bc9eecd783d479a58f1177a06c 100644 --- a/dune/gdt/spaces/fv/defaultproduct.hh +++ b/dune/gdt/spaces/fv/defaultproduct.hh @@ -53,14 +53,14 @@ public: template <class GridViewImp, class RangeFieldImp, size_t rangeDim> class DefaultProduct<GridViewImp, RangeFieldImp, rangeDim, 1> - : public Dune::GDT::Spaces::FVInterface<internal::DefaultProductTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, - GridViewImp::dimension, rangeDim, 1>, + : public Dune::GDT::FvSpaceInterface<internal::DefaultProductTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, + GridViewImp::dimension, rangeDim, 1>, public Dune::GDT::ProductSpaceInterface<internal::DefaultProductTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, GridViewImp::dimension, rangeDim, 1> { typedef DefaultProduct<GridViewImp, RangeFieldImp, rangeDim, 1> ThisType; - typedef Dune::GDT::Spaces::FVInterface<internal::DefaultProductTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, - GridViewImp::dimension, rangeDim, 1> BaseType; + typedef Dune::GDT::FvSpaceInterface<internal::DefaultProductTraits<GridViewImp, RangeFieldImp, rangeDim, 1>, + GridViewImp::dimension, rangeDim, 1> BaseType; typedef Default<GridViewImp, RangeFieldImp, rangeDim, 1> DefaultFVSpaceType; public: diff --git a/dune/gdt/spaces/fv/interface.hh b/dune/gdt/spaces/fv/interface.hh index 37bc8169e97508539ff7b5becca68007b14aa34f..953b850fd54b90cb32d52b9ff5afd4f8528684f1 100644 --- a/dune/gdt/spaces/fv/interface.hh +++ b/dune/gdt/spaces/fv/interface.hh @@ -12,11 +12,10 @@ namespace Dune { namespace GDT { -namespace Spaces { template <class Traits, size_t domainDim, size_t rangeDim, size_t rangeDimCols = 1> -class FVInterface : public SpaceInterface<Traits, domainDim, rangeDim, rangeDimCols> +class FvSpaceInterface : public SpaceInterface<Traits, domainDim, rangeDim, rangeDimCols> { typedef SpaceInterface<Traits, domainDim, rangeDim, rangeDimCols> BaseType; @@ -40,10 +39,9 @@ public: { static_assert(AlwaysFalse<S>::value, "FV spaces do not implement constraints!"); } -}; // class FVInterface +}; // class FvSpaceInterface -} // namespace Spaces namespace internal { @@ -64,7 +62,7 @@ struct is_fv_space_helper template <class S, bool candidate = internal::is_fv_space_helper<S>::is_candidate> struct is_fv_space - : public std::is_base_of<Spaces::FVInterface<typename S::Traits, S::dimDomain, S::dimRange, S::dimRangeCols>, S> + : public std::is_base_of<FvSpaceInterface<typename S::Traits, S::dimDomain, S::dimRange, S::dimRangeCols>, S> { };