[spaces.dg.fem] moved DiscontinuousLangrange -> DG, refs #14

dune/gdt/playground/spaces/dg/fem.hh

+// This file is part of the dune-gdt project:
+//   http://users.dune-project.org/projects/dune-gdt
+// Copyright holders: Felix Schindler
+// License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
+
+#ifndef DUNE_GDT_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH
+#define DUNE_GDT_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH
+
+#include <memory>
+
+#include <dune/common/unused.hh>
+#include <dune/common/deprecated.hh>
+
+#if HAVE_DUNE_FEM
+#include <dune/stuff/common/disable_warnings.hh>
+#include <dune/fem/space/discontinuousgalerkin/lagrange.hh>
+#include <dune/stuff/common/reenable_warnings.hh>
+#endif // HAVE_DUNE_FEM
+
+#include <dune/stuff/common/type_utils.hh>
+
+#include <dune/gdt/spaces/parallel.hh>
+
+#include "../../../mapper/fem.hh"
+#include "../../../basefunctionset/fem.hh"
+
+#include "../../../spaces/interface.hh"
+
+namespace Dune {
+namespace GDT {
+namespace Spaces {
+namespace DG {
+
+#if HAVE_DUNE_FEM
+
+
+// forward, to be used in the traits and to allow for specialization
+template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1>
+class FemBased
+{
+  static_assert(Dune::AlwaysFalse<GridPartImp>::value, "Untested for these dimensions!");
+};
+
+
+template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols>
+class FemBasedTraits
+{
+public:
+  typedef FemBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> derived_type;
+  typedef GridPartImp GridPartType;
+  typedef typename GridPartType::GridViewType GridViewType;
+  static const int polOrder = polynomialOrder;
+  static_assert(polOrder >= 1, "Wrong polOrder given!");
+
+private:
+  typedef typename GridPartType::ctype DomainFieldType;
+  static const unsigned int dimDomain = GridPartType::dimension;
+
+public:
+  typedef RangeFieldImp RangeFieldType;
+
+private:
+  typedef Dune::Fem::FunctionSpace<DomainFieldType, RangeFieldType, dimDomain, rangeDim> FunctionSpaceType;
+
+public:
+  typedef Dune::Fem::LagrangeDiscontinuousGalerkinSpace<FunctionSpaceType, GridPartType, polOrder> BackendType;
+  typedef Mapper::FemDofWrapper<typename BackendType::BlockMapperType, BackendType::Traits::localBlockSize> MapperType;
+  typedef typename GridPartType::template Codim<0>::EntityType EntityType;
+  typedef BaseFunctionSet::FemWrapper<typename BackendType::ShapeFunctionSetType, EntityType, DomainFieldType,
+                                      dimDomain, RangeFieldType, rangeDim, rangeDimCols> BaseFunctionSetType;
+  static const Stuff::Grid::ChoosePartView part_view_type = Stuff::Grid::ChoosePartView::part;
+  static const bool needs_grid_view                       = false;
+  typedef CommunicationChooser<GridViewType, false> CommunicationChooserType;
+  typedef typename CommunicationChooserType::Type CommunicatorType;
+}; // class FemBasedTraits
+
+
+// untested for the vector-valued case
+template <class GridPartImp, int polynomialOrder, class RangeFieldImp>
+class FemBased<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1>
+    : public SpaceInterface<FemBasedTraits<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1>, GridPartImp::dimension,
+                            1, 1>
+{
+  typedef FemBased<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1> ThisType;
+  typedef SpaceInterface<FemBasedTraits<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1>, GridPartImp::dimension, 1,
+                         1> BaseType;
+
+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 unsigned int dimRange     = BaseType::dimRange;
+  static const unsigned int dimRangeCols = BaseType::dimRangeCols;
+
+  typedef typename Traits::BackendType BackendType;
+  typedef typename Traits::MapperType MapperType;
+  typedef typename Traits::BaseFunctionSetType BaseFunctionSetType;
+  typedef typename Traits::EntityType EntityType;
+  typedef typename Traits::CommunicationChooserType CommunicationChooserType;
+  typedef typename Traits::CommunicatorType CommunicatorType;
+
+  typedef Dune::Stuff::LA::SparsityPatternDefault PatternType;
+
+  FemBased(GridPartType gridP)
+    : gridPart_(new GridPartType(gridP))
+    , gridView_(new GridViewType(gridPart_->gridView()))
+    , backend_(new BackendType(*gridPart_))
+    , mapper_(new MapperType(backend_->blockMapper()))
+    , communicator_(CommunicationChooserType::create(*gridView_))
+  {
+  }
+
+  FemBased(const ThisType& other) = default;
+
+  FemBased(ThisType&& source) = default;
+
+  ThisType& operator=(const ThisType& other) = delete;
+
+  ThisType& operator=(ThisType&& source) = delete;
+
+  using BaseType::compute_pattern;
+
+  template <class G, class S, int d, int r, int rC>
+  PatternType compute_pattern(const GridView<G>& local_grid_view, const SpaceInterface<S, d, r, rC>& ansatz_space) const
+  {
+    return BaseType::compute_face_and_volume_pattern(local_grid_view, ansatz_space);
+  }
+
+  const GridPartType& grid_part() const
+  {
+    return *gridPart_;
+  }
+
+  const GridViewType& grid_view() const
+  {
+    return *gridView_;
+  }
+
+  const BackendType& backend() const
+  {
+    return *backend_;
+  }
+
+  const MapperType& mapper() const
+  {
+    return *mapper_;
+  }
+
+  BaseFunctionSetType base_function_set(const EntityType& entity) const
+  {
+    return BaseFunctionSetType(*backend_, entity);
+  }
+
+  CommunicatorType& communicator() const
+  {
+    // no need to prepare the communicator, since we are not pdelab based
+    return *communicator_;
+  }
+
+private:
+  std::shared_ptr<GridPartType> gridPart_;
+  const std::shared_ptr<const GridViewType> gridView_;
+  const std::shared_ptr<const BackendType> backend_;
+  const std::shared_ptr<const MapperType> mapper_;
+  mutable std::shared_ptr<CommunicatorType> communicator_;
+}; // class FemBased< ..., 1 >
+
+
+#else // HAVE_DUNE_FEM
+
+
+template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1>
+class FemBased
+{
+  static_assert(Dune::AlwaysFalse<GridPartImp>::value, "You are missing dune-fem!");
+};
+
+
+#endif // HAVE_DUNE_FEM
+
+
+} // namespace DG
+namespace DiscontinuousLagrange {
+
+
+template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1>
+class DUNE_DEPRECATED_MSG("Use RT::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
+
+#endif // DUNE_GDT_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH

dune/gdt/playground/spaces/discontinuouslagrange/fem.hh

@@ -3,193 +3,10 @@
 // Copyright holders: Felix Schindler
 // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-#ifndef DUNE_GDT_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH
-#define DUNE_GDT_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH
+#ifndef DUNE_GDT_PLAYGROUND_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH
+#define DUNE_GDT_PLAYGROUND_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH
 
-#include <memory>
+#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>
 
-#include <dune/common/unused.hh>
-
-#if HAVE_DUNE_FEM
-#include <dune/stuff/common/disable_warnings.hh>
-#include <dune/fem/space/discontinuousgalerkin/lagrange.hh>
-#include <dune/stuff/common/reenable_warnings.hh>
-#endif // HAVE_DUNE_FEM
-
-#include <dune/stuff/common/type_utils.hh>
-
-#include <dune/gdt/spaces/parallel.hh>
-
-#include "../../../mapper/fem.hh"
-#include "../../../basefunctionset/fem.hh"
-
-#include "../../../spaces/interface.hh"
-
-namespace Dune {
-namespace GDT {
-namespace Spaces {
-namespace DiscontinuousLagrange {
-
-#if HAVE_DUNE_FEM
-
-
-// forward, to be used in the traits and to allow for specialization
-template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1>
-class FemBased
-{
-  static_assert(Dune::AlwaysFalse<GridPartImp>::value, "Untested for these dimensions!");
-};
-
-
-template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols>
-class FemBasedTraits
-{
-public:
-  typedef FemBased<GridPartImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> derived_type;
-  typedef GridPartImp GridPartType;
-  typedef typename GridPartType::GridViewType GridViewType;
-  static const int polOrder = polynomialOrder;
-  static_assert(polOrder >= 1, "Wrong polOrder given!");
-
-private:
-  typedef typename GridPartType::ctype DomainFieldType;
-  static const unsigned int dimDomain = GridPartType::dimension;
-
-public:
-  typedef RangeFieldImp RangeFieldType;
-
-private:
-  typedef Dune::Fem::FunctionSpace<DomainFieldType, RangeFieldType, dimDomain, rangeDim> FunctionSpaceType;
-
-public:
-  typedef Dune::Fem::LagrangeDiscontinuousGalerkinSpace<FunctionSpaceType, GridPartType, polOrder> BackendType;
-  typedef Mapper::FemDofWrapper<typename BackendType::BlockMapperType, BackendType::Traits::localBlockSize> MapperType;
-  typedef typename GridPartType::template Codim<0>::EntityType EntityType;
-  typedef BaseFunctionSet::FemWrapper<typename BackendType::ShapeFunctionSetType, EntityType, DomainFieldType,
-                                      dimDomain, RangeFieldType, rangeDim, rangeDimCols> BaseFunctionSetType;
-  static const Stuff::Grid::ChoosePartView part_view_type = Stuff::Grid::ChoosePartView::part;
-  static const bool needs_grid_view                       = false;
-  typedef CommunicationChooser<GridViewType, false> CommunicationChooserType;
-  typedef typename CommunicationChooserType::Type CommunicatorType;
-}; // class FemBasedTraits
-
-
-// untested for the vector-valued case
-template <class GridPartImp, int polynomialOrder, class RangeFieldImp>
-class FemBased<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1>
-    : public SpaceInterface<FemBasedTraits<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1>, GridPartImp::dimension,
-                            1, 1>
-{
-  typedef FemBased<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1> ThisType;
-  typedef SpaceInterface<FemBasedTraits<GridPartImp, polynomialOrder, RangeFieldImp, 1, 1>, GridPartImp::dimension, 1,
-                         1> BaseType;
-
-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 unsigned int dimRange     = BaseType::dimRange;
-  static const unsigned int dimRangeCols = BaseType::dimRangeCols;
-
-  typedef typename Traits::BackendType BackendType;
-  typedef typename Traits::MapperType MapperType;
-  typedef typename Traits::BaseFunctionSetType BaseFunctionSetType;
-  typedef typename Traits::EntityType EntityType;
-  typedef typename Traits::CommunicationChooserType CommunicationChooserType;
-  typedef typename Traits::CommunicatorType CommunicatorType;
-
-  typedef Dune::Stuff::LA::SparsityPatternDefault PatternType;
-
-  FemBased(GridPartType gridP)
-    : gridPart_(new GridPartType(gridP))
-    , gridView_(new GridViewType(gridPart_->gridView()))
-    , backend_(new BackendType(*gridPart_))
-    , mapper_(new MapperType(backend_->blockMapper()))
-    , communicator_(CommunicationChooserType::create(*gridView_))
-  {
-  }
-
-  FemBased(const ThisType& other) = default;
-
-  FemBased(ThisType&& source) = default;
-
-  ThisType& operator=(const ThisType& other) = delete;
-
-  ThisType& operator=(ThisType&& source) = delete;
-
-  using BaseType::compute_pattern;
-
-  template <class G, class S, int d, int r, int rC>
-  PatternType compute_pattern(const GridView<G>& local_grid_view, const SpaceInterface<S, d, r, rC>& ansatz_space) const
-  {
-    return BaseType::compute_face_and_volume_pattern(local_grid_view, ansatz_space);
-  }
-
-  const GridPartType& grid_part() const
-  {
-    return *gridPart_;
-  }
-
-  const GridViewType& grid_view() const
-  {
-    return *gridView_;
-  }
-
-  const BackendType& backend() const
-  {
-    return *backend_;
-  }
-
-  const MapperType& mapper() const
-  {
-    return *mapper_;
-  }
-
-  BaseFunctionSetType base_function_set(const EntityType& entity) const
-  {
-    return BaseFunctionSetType(*backend_, entity);
-  }
-
-  CommunicatorType& communicator() const
-  {
-    // no need to prepare the communicator, since we are not pdelab based
-    return *communicator_;
-  }
-
-private:
-  std::shared_ptr<GridPartType> gridPart_;
-  const std::shared_ptr<const GridViewType> gridView_;
-  const std::shared_ptr<const BackendType> backend_;
-  const std::shared_ptr<const MapperType> mapper_;
-  mutable std::shared_ptr<CommunicatorType> communicator_;
-}; // class FemBased< ..., 1 >
-
-
-#else // HAVE_DUNE_FEM
-
-
-template <class GridPartImp, int polynomialOrder, class RangeFieldImp, int rangeDim, int rangeDimCols = 1>
-class FemBased
-{
-  static_assert(Dune::AlwaysFalse<GridPartImp>::value, "You are missing dune-fem!");
-};
-
-
-#endif // HAVE_DUNE_FEM
-
-} // namespace DiscontinuousLagrange
-} // namespace Spaces
-} // namespace GDT
-} // namespace Dune
-
-#endif // DUNE_GDT_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH
+#endif // DUNE_GDT_PLAYGROUND_SPACES_DISCONTINUOUSLAGRANGE_FEM_HH