diff --git a/dune/gdt/playground/spaces/dg/fem.hh b/dune/gdt/playground/spaces/dg/fem.hh index d4f98decae75842dd195aa9d1ef3a927ef3e3d39..2e302fa793d4ca22fb039d9f723f720cef0ff646 100644 --- a/dune/gdt/playground/spaces/dg/fem.hh +++ b/dune/gdt/playground/spaces/dg/fem.hh @@ -88,20 +88,14 @@ class FemBased<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1> public: typedef FemBasedTraits<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1> Traits; - typedef typename Traits::GridPartType GridPartType; - typedef typename Traits::GridViewType GridViewType; - static const int polOrder = Traits::polOrder; - typedef typename GridPartType::ctype DomainFieldType; - static const unsigned int dimDomain = BaseType::dimDomain; - -private: - static_assert(GridPartType::dimension == dimDomain, "Dimension of GridPart has to match dimDomain"); - -public: - typedef typename Traits::RangeFieldType RangeFieldType; + static const int polOrder = Traits::polOrder; + static const unsigned int dimDomain = BaseType::dimDomain; static const unsigned int dimRange = BaseType::dimRange; static const unsigned int dimRangeCols = BaseType::dimRangeCols; + typedef typename Traits::GridPartType GridPartType; + typedef typename Traits::GridViewType GridViewType; + typedef typename Traits::RangeFieldType RangeFieldType; typedef typename Traits::BackendType BackendType; typedef typename Traits::MapperType MapperType; typedef typename Traits::BaseFunctionSetType BaseFunctionSetType; @@ -110,6 +104,7 @@ public: typedef typename Traits::CommunicatorType CommunicatorType; typedef Dune::Stuff::LA::SparsityPatternDefault PatternType; + typedef typename GridPartType::ctype DomainFieldType; FemBased(GridPartType gridP) : gridPart_(new GridPartType(gridP)) @@ -190,23 +185,6 @@ class FemBased } // namespace DG -namespace DiscontinuousLagrange { - - -template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1> -class DUNE_DEPRECATED_MSG("Use DG::FemBased instead (21.11.2014)!") FemBased - : public DG::FemBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> -{ -public: - template <class... Args> - FemBased(Args&&... args) - : DG::FemBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>(std::forward<Args>(args)...) - { - } -}; - - -} // namespace DiscontinuousLagrange } // namespace Spaces } // namespace GDT } // namespace Dune diff --git a/dune/gdt/playground/spaces/discontinuouslagrange/fem.hh b/dune/gdt/playground/spaces/discontinuouslagrange/fem.hh index fd5c8b7a09f1235dc238e7bb5fe468b9ac7302a2..18bc77355c2b5476a5b6a57d9653dd713d023f42 100644 --- a/dune/gdt/playground/spaces/discontinuouslagrange/fem.hh +++ b/dune/gdt/playground/spaces/discontinuouslagrange/fem.hh @@ -9,4 +9,22 @@ #warning This header is deprecated, include <dune/gdt/playground/spaces/dg/fem.hh> instead (21.11.2014)! #include <dune/gdt/playground/spaces/dg/fem.hh> +namespace DiscontinuousLagrange { + + +template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1> +class DUNE_DEPRECATED_MSG("Use DG::FemBased instead (21.11.2014)!") FemBased + : public DG::FemBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> +{ +public: + template <class... Args> + FemBased(Args&&... args) + : DG::FemBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>(std::forward<Args>(args)...) + { + } +}; + + +} // namespace DiscontinuousLagrange + #endif // DUNE_GDT_PLAYGROUND_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH