Skip to content
Snippets Groups Projects
Commit a2a8753a authored by Dr. Felix Tobias Schindler's avatar Dr. Felix Tobias Schindler
Browse files

update names and includes

parent 9b36508f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dune/gdt/playground/spaces/dg/dune-pdelab-wrapper.hh
+ 19
− 24
View file @ a2a8753a
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
// Copyright holders: Felix Schindler // Copyright holders: Felix Schindler
// License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause) // License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
#ifndef DUNE_GDT_PLAYGROUND_SPACES_DG_PDELAB_HH #ifndef DUNE_GDT_PLAYGROUND_SPACES_DG_DUNE_PDELAB_WRAPPER_HH
#define DUNE_GDT_PLAYGROUND_SPACES_DG_PDELAB_HH #define DUNE_GDT_PLAYGROUND_SPACES_DG_DUNE_PDELAB_WRAPPER_HH
#include <memory> #include <memory>
...@@ -24,22 +24,19 @@ ...@@ -24,22 +24,19 @@
#include <dune/gdt/spaces/parallel.hh> #include <dune/gdt/spaces/parallel.hh>
#include "../../../mapper/pdelab.hh"
#include <dune/gdt/spaces/basefunctionset/dune-pdelab-wrapper.hh> #include <dune/gdt/spaces/basefunctionset/dune-pdelab-wrapper.hh>
#include <dune/gdt/spaces/dg/interface.hh>
#include "../../../spaces/dg/interface.hh" #include "../mapper/dune-pdelab-wrapper.hh"
namespace Dune { namespace Dune {
namespace GDT { namespace GDT {
namespace Spaces {
namespace DG {
#if HAVE_DUNE_PDELAB #if HAVE_DUNE_PDELAB
// forward, to be used in the traits and to allow for specialization // forward, to be used in the traits and to allow for specialization
template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols = 1> template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols = 1>
class PdelabBased class DunePdelabDgSpaceWrapper
{ {
static_assert(Dune::AlwaysFalse<GridViewImp>::value, "Untested for this combination of dimensions!"); static_assert(Dune::AlwaysFalse<GridViewImp>::value, "Untested for this combination of dimensions!");
}; };
...@@ -49,10 +46,10 @@ namespace internal { ...@@ -49,10 +46,10 @@ namespace internal {
template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols = 1> template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols = 1>
class PdelabBasedTraits class DunePdelabDgSpaceWrapperTraits
{ {
public: public:
typedef PdelabBased<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> derived_type; typedef DunePdelabDgSpaceWrapper<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> derived_type;
typedef GridViewImp GridViewType; typedef GridViewImp GridViewType;
static const int polOrder = polynomialOrder; static const int polOrder = polynomialOrder;
static const bool continuous = false; static const bool continuous = false;
...@@ -102,20 +99,20 @@ public: ...@@ -102,20 +99,20 @@ public:
typedef typename CommunicationChooserType::Type CommunicatorType; typedef typename CommunicationChooserType::Type CommunicatorType;
private: private:
friend class PdelabBased<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>; friend class DunePdelabDgSpaceWrapper<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>;
}; // class PdelabBasedTraits }; // class DunePdelabDgSpaceWrapperTraits
} // namespace internal } // namespace internal
template <class GridViewImp, int polynomialOrder, class RangeFieldImp> template <class GridViewImp, int polynomialOrder, class RangeFieldImp>
class PdelabBased<GridViewImp, polynomialOrder, RangeFieldImp, 1, 1> class DunePdelabDgSpaceWrapper<GridViewImp, polynomialOrder, RangeFieldImp, 1, 1>
: public DGInterface<internal::PdelabBasedTraits<GridViewImp, polynomialOrder, RangeFieldImp, 1, 1>, : public DGInterface<internal::DunePdelabDgSpaceWrapperTraits<GridViewImp, polynomialOrder, RangeFieldImp, 1, 1>,
GridViewImp::dimension, 1, 1> GridViewImp::dimension, 1, 1>
{ {
typedef PdelabBased<GridViewImp, polynomialOrder, RangeFieldImp, 1, 1> ThisType; typedef DunePdelabDgSpaceWrapper<GridViewImp, polynomialOrder, RangeFieldImp, 1, 1> ThisType;
typedef DGInterface<internal::PdelabBasedTraits<GridViewImp, polynomialOrder, RangeFieldImp, 1, 1>, typedef DGInterface<internal::DunePdelabDgSpaceWrapperTraits<GridViewImp, polynomialOrder, RangeFieldImp, 1, 1>,
GridViewImp::dimension, 1, 1> BaseType; GridViewImp::dimension, 1, 1> BaseType;
public: public:
...@@ -134,7 +131,7 @@ private: ...@@ -134,7 +131,7 @@ private:
public: public:
using typename BaseType::CommunicatorType; using typename BaseType::CommunicatorType;
PdelabBased(GridViewType gV) DunePdelabDgSpaceWrapper(GridViewType gV)
: grid_view_(gV) : grid_view_(gV)
, fe_map_() , fe_map_()
, backend_(grid_view_, fe_map_) , backend_(grid_view_, fe_map_)
...@@ -148,7 +145,7 @@ public: ...@@ -148,7 +145,7 @@ public:
* \brief Copy ctor. * \brief Copy ctor.
* \note Manually implemented bc of the std::mutex + communicator_ unique_ptr * \note Manually implemented bc of the std::mutex + communicator_ unique_ptr
*/ */
PdelabBased(const ThisType& other) DunePdelabDgSpaceWrapper(const ThisType& other)
: grid_view_(other.grid_view_) : grid_view_(other.grid_view_)
, fe_map_() , fe_map_()
, backend_(grid_view_, fe_map_) , backend_(grid_view_, fe_map_)
...@@ -165,7 +162,7 @@ public: ...@@ -165,7 +162,7 @@ public:
* \brief Move ctor. * \brief Move ctor.
* \note Manually implemented bc of the std::mutex. * \note Manually implemented bc of the std::mutex.
*/ */
PdelabBased(ThisType&& source) DunePdelabDgSpaceWrapper(ThisType&& source)
: grid_view_(source.grid_view_) : grid_view_(source.grid_view_)
, fe_map_(source.fe_map_) , fe_map_(source.fe_map_)
, backend_(source.backend_) , backend_(source.backend_)
...@@ -215,14 +212,14 @@ private: ...@@ -215,14 +212,14 @@ private:
mutable std::unique_ptr<CommunicatorType> communicator_; mutable std::unique_ptr<CommunicatorType> communicator_;
mutable bool communicator_prepared_; mutable bool communicator_prepared_;
mutable std::mutex communicator_mutex_; mutable std::mutex communicator_mutex_;
}; // class PdelabBased< ..., 1 > }; // class DunePdelabDgSpaceWrapper< ..., 1 >
#else // HAVE_DUNE_PDELAB #else // HAVE_DUNE_PDELAB
template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols = 1> template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols = 1>
class PdelabBased class DunePdelabDgSpaceWrapper
{ {
static_assert(Dune::AlwaysFalse<GridViewImp>::value, "You are missing dune-pdelab!"); static_assert(Dune::AlwaysFalse<GridViewImp>::value, "You are missing dune-pdelab!");
}; };
...@@ -231,9 +228,7 @@ class PdelabBased ...@@ -231,9 +228,7 @@ class PdelabBased
#endif // HAVE_DUNE_PDELAB #endif // HAVE_DUNE_PDELAB
} // namespace DG
} // namespace Spaces
} // namespace GDT } // namespace GDT
} // namespace Dune } // namespace Dune
#endif // DUNE_GDT_PLAYGROUND_SPACES_DG_PDELAB_HH #endif // DUNE_GDT_PLAYGROUND_SPACES_DG_DUNE_PDELAB_WRAPPER_HH
dune/gdt/playground/spaces/dg/pdelabproduct.hh
+ 4
− 4
View file @ a2a8753a
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <dune/gdt/spaces/interface.hh> #include <dune/gdt/spaces/interface.hh>
#include <dune/gdt/spaces/dg/interface.hh> #include <dune/gdt/spaces/dg/interface.hh>
#include <dune/gdt/playground/spaces/dg/pdelab.hh> #include <dune/gdt/playground/spaces/dg/dune-pdelab-wrapper.hh>
#include <dune/gdt/playground/spaces/mapper/dune-pdelab-wrapper.hh> #include <dune/gdt/playground/spaces/mapper/dune-pdelab-wrapper.hh>
namespace Dune { namespace Dune {
...@@ -36,9 +36,9 @@ namespace internal { ...@@ -36,9 +36,9 @@ namespace internal {
template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols> template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols>
class PdelabBasedProductTraits class PdelabBasedProductTraits
: public PdelabBasedTraits<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> : public DunePdelabDgSpaceWrapperTraits<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>
{ {
typedef PdelabBasedTraits<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> BaseType; typedef DunePdelabDgSpaceWrapperTraits<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> BaseType;
public: public:
typedef PdelabBasedProduct<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> derived_type; typedef PdelabBasedProduct<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> derived_type;
...@@ -54,7 +54,7 @@ public: ...@@ -54,7 +54,7 @@ public:
using BaseType::part_view_type; using BaseType::part_view_type;
using BaseType::needs_grid_view; using BaseType::needs_grid_view;
typedef typename Dune::GDT::Spaces::DG::PdelabBased<GridViewType, polOrder, RangeFieldType, 1, dimRangeCols> typedef typename Dune::GDT::DunePdelabDgSpaceWrapper<GridViewType, polOrder, RangeFieldType, 1, dimRangeCols>
FactorSpaceType; FactorSpaceType;
typedef typename DSC::make_identical_tuple<FactorSpaceType, dimRange>::type SpaceTupleType; typedef typename DSC::make_identical_tuple<FactorSpaceType, dimRange>::type SpaceTupleType;
}; };
......
dune/gdt/spaces/dg.hh
+ 1
− 1
View file @ a2a8753a
...@@ -51,7 +51,7 @@ private: ...@@ -51,7 +51,7 @@ private:
template <class G, int p, class R, size_t r, size_t rC> template <class G, int p, class R, size_t r, size_t rC>
struct SpaceChooser<G, p, R, r, rC, GDT::ChooseSpaceBackend::pdelab> struct SpaceChooser<G, p, R, r, rC, GDT::ChooseSpaceBackend::pdelab>
{ {
typedef GDT::Spaces::DG::PdelabBased<GridLayerType, p, R, r> Type; typedef GDT::DunePdelabDgSpaceWrapper<GridLayerType, p, R, r> Type;
}; };
typedef Stuff::Grid::ProviderInterface<GridType> GridProviderType; typedef Stuff::Grid::ProviderInterface<GridType> GridProviderType;
......
dune/gdt/test/spaces/dg/pdelab.hh
+ 7
− 7
View file @ a2a8753a
...@@ -6,17 +6,17 @@ ...@@ -6,17 +6,17 @@
#ifndef DUNE_GDT_TEST_SPACES_DG_PDELAB_HH #ifndef DUNE_GDT_TEST_SPACES_DG_PDELAB_HH
#define DUNE_GDT_TEST_SPACES_DG_PDELAB_HH #define DUNE_GDT_TEST_SPACES_DG_PDELAB_HH
#include <dune/gdt/playground/spaces/dg/pdelab.hh> #include <dune/gdt/playground/spaces/dg/dune-pdelab-wrapper.hh>
#include <dune/gdt/test/grids.hh> #include <dune/gdt/test/grids.hh>
#if HAVE_DUNE_PDELAB #if HAVE_DUNE_PDELAB
#define SPACE_DG_PDELAB_SGRID(dd, rr, pp) Dune::GDT::Spaces::DG::PdelabBased<S##dd##dLeafGridViewType, pp, double, rr> #define SPACE_DG_PDELAB_SGRID(dd, rr, pp) Dune::GDT::DunePdelabDgSpaceWrapper<S##dd##dLeafGridViewType, pp, double, rr>
#define SPACE_DG_PDELAB_YASPGRID(dd, rr, pp) \ #define SPACE_DG_PDELAB_YASPGRID(dd, rr, pp) \
Dune::GDT::Spaces::DG::PdelabBased<Yasp##dd##dLeafGridViewType, pp, double, rr> Dune::GDT::DunePdelabDgSpaceWrapper<Yasp##dd##dLeafGridViewType, pp, double, rr>
#define SPACES_DG_PDELAB(pp) \ #define SPACES_DG_PDELAB(pp) \
SPACE_DG_PDELAB_SGRID(1, 1, pp) \ SPACE_DG_PDELAB_SGRID(1, 1, pp) \
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#define SPACE_DG_PDELAB_SGRID_LEVEL(dd, rr, pp) \ #define SPACE_DG_PDELAB_SGRID_LEVEL(dd, rr, pp) \
Dune::GDT::Spaces::DG::PdelabBased<S##dd##dLevelGridViewType, pp, double, rr> Dune::GDT::DunePdelabDgSpaceWrapper<S##dd##dLevelGridViewType, pp, double, rr>
#define SPACE_DG_PDELAB_YASPGRID_LEVEL(dd, rr, pp) \ #define SPACE_DG_PDELAB_YASPGRID_LEVEL(dd, rr, pp) \
Dune::GDT::Spaces::DG::PdelabBased<Yasp##dd##dLevelGridViewType, pp, double, rr> Dune::GDT::DunePdelabDgSpaceWrapper<Yasp##dd##dLevelGridViewType, pp, double, rr>
#define SPACES_DG_PDELAB_LEVEL(pp) \ #define SPACES_DG_PDELAB_LEVEL(pp) \
SPACE_DG_PDELAB_SGRID_LEVEL(1, 1, pp) \ SPACE_DG_PDELAB_SGRID_LEVEL(1, 1, pp) \
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#define SPACE_DG_PDELAB_ALUCUBEGRID(dd, rr, pp) \ #define SPACE_DG_PDELAB_ALUCUBEGRID(dd, rr, pp) \
Dune::GDT::Spaces::DG::PdelabBased<AluCube##dd##dLeafGridViewType, pp, double, rr> Dune::GDT::DunePdelabDgSpaceWrapper<AluCube##dd##dLeafGridViewType, pp, double, rr>
#define SPACES_DG_PDELAB_ALUGRID(pp) \ #define SPACES_DG_PDELAB_ALUGRID(pp) \
SPACE_DG_PDELAB_ALUCUBEGRID(2, 1, pp) \ SPACE_DG_PDELAB_ALUCUBEGRID(2, 1, pp) \
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#define SPACE_DG_PDELAB_ALUCUBEGRID_LEVEL(dd, rr, pp) \ #define SPACE_DG_PDELAB_ALUCUBEGRID_LEVEL(dd, rr, pp) \
Dune::GDT::Spaces::DG::PdelabBased<AluCube##dd##dLevelGridViewType, pp, double, rr> Dune::GDT::DunePdelabDgSpaceWrapper<AluCube##dd##dLevelGridViewType, pp, double, rr>
#define SPACES_DG_PDELAB_ALUGRID_LEVEL(pp) \ #define SPACES_DG_PDELAB_ALUGRID_LEVEL(pp) \
SPACE_DG_PDELAB_ALUCUBEGRID_LEVEL(2, 1, pp) \ SPACE_DG_PDELAB_ALUCUBEGRID_LEVEL(2, 1, pp) \
......
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