From 23ecc4dc372c4fa00c214a074a64ac671d0801a8 Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Tue, 12 Apr 2016 15:31:21 +0200
Subject: [PATCH] update names and includes
---
dune/gdt/operators/fv.hh | 12 +++---
.../spaces/dg/dune-pdelab-wrapper.hh | 38 ++++++++++---------
.../gdt/playground/spaces/dg/pdelabproduct.hh | 30 ---------------
3 files changed, 27 insertions(+), 53 deletions(-)
delete mode 100644 dune/gdt/playground/spaces/dg/pdelabproduct.hh
diff --git a/dune/gdt/operators/fv.hh b/dune/gdt/operators/fv.hh
index 0418f97c3..2b3ed6525 100644
--- a/dune/gdt/operators/fv.hh
+++ b/dune/gdt/operators/fv.hh
@@ -24,7 +24,7 @@
#include <dune/gdt/discretefunction/default.hh>
#include <dune/gdt/operators/default.hh>
-#include <dune/gdt/playground/spaces/dg/pdelabproduct.hh>
+#include <dune/gdt/playground/spaces/dg/dune-pdelab-wrapper.hh>
#include "interfaces.hh"
#include "default.hh"
@@ -303,11 +303,11 @@ public:
{
const auto current_boundary_values = boundary_values_.evaluate_at_time(time);
if (use_linear_reconstruction_) {
- typedef Spaces::DG::PdelabBasedProduct<typename SourceType::SpaceType::GridViewType,
- 1, // polOrder
- RangeFieldType,
- dimRange,
- dimRangeCols> DGSpaceType;
+ typedef DunePdelabDgProductSpaceWrapper<typename SourceType::SpaceType::GridViewType,
+ 1, // polOrder
+ RangeFieldType,
+ dimRange,
+ dimRangeCols> DGSpaceType;
typedef DiscreteFunction<DGSpaceType, typename SourceType::VectorType> ReconstructedDiscreteFunctionType;
const auto dg_space_ = DSC::make_unique<DGSpaceType>(range.space().grid_view());
const auto reconstruction = DSC::make_unique<ReconstructedDiscreteFunctionType>(*dg_space_, "reconstructed");
diff --git a/dune/gdt/playground/spaces/dg/dune-pdelab-wrapper.hh b/dune/gdt/playground/spaces/dg/dune-pdelab-wrapper.hh
index 1e4b54bd5..84b521720 100644
--- a/dune/gdt/playground/spaces/dg/dune-pdelab-wrapper.hh
+++ b/dune/gdt/playground/spaces/dg/dune-pdelab-wrapper.hh
@@ -46,7 +46,7 @@ class DunePdelabDgSpaceWrapper
// 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>
-class PdelabBasedProduct
+class DunePdelabDgProductSpaceWrapper
{
static_assert(Dune::AlwaysFalse<GridViewImp>::value, "Untested for these dimensions!");
};
@@ -114,13 +114,14 @@ private:
template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim, size_t rangeDimCols>
-class PdelabBasedProductTraits
+class DunePdelabDgProductSpaceWrapperTraits
: public DunePdelabDgSpaceWrapperTraits<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>
{
typedef DunePdelabDgSpaceWrapperTraits<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> BaseType;
public:
- typedef PdelabBasedProduct<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols> derived_type;
+ typedef DunePdelabDgProductSpaceWrapper<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, rangeDimCols>
+ derived_type;
using typename BaseType::GridViewType;
static const int polOrder = BaseType::polOrder;
static const size_t dimDomain = GridViewType::dimension;
@@ -252,21 +253,24 @@ private:
template <class GridViewImp, int polynomialOrder, class RangeFieldImp, size_t rangeDim>
-class PdelabBasedProduct<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, 1>
- : public Dune::GDT::SpaceInterface<internal::PdelabBasedProductTraits<GridViewImp, polynomialOrder, RangeFieldImp,
- rangeDim, 1>,
+class DunePdelabDgProductSpaceWrapper<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, 1>
+ : public Dune::GDT::SpaceInterface<internal::DunePdelabDgProductSpaceWrapperTraits<GridViewImp, polynomialOrder,
+ RangeFieldImp, rangeDim, 1>,
GridViewImp::dimension, rangeDim, 1>,
- public Dune::GDT::ProductSpaceInterface<internal::PdelabBasedProductTraits<GridViewImp, polynomialOrder,
- RangeFieldImp, rangeDim, 1>,
- GridViewImp::dimension, rangeDim, 1>
-{
- typedef PdelabBasedProduct<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, 1> ThisType;
- typedef typename Dune::GDT::SpaceInterface<internal::PdelabBasedProductTraits<GridViewImp, polynomialOrder,
+ public Dune::GDT::
+ ProductSpaceInterface<internal::DunePdelabDgProductSpaceWrapperTraits<GridViewImp, polynomialOrder,
RangeFieldImp, rangeDim, 1>,
- GridViewImp::dimension, rangeDim, 1> BaseType;
+ GridViewImp::dimension, rangeDim, 1>
+{
+ typedef DunePdelabDgProductSpaceWrapper<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, 1> ThisType;
+ typedef
+ typename Dune::GDT::SpaceInterface<internal::DunePdelabDgProductSpaceWrapperTraits<GridViewImp, polynomialOrder,
+ RangeFieldImp, rangeDim, 1>,
+ GridViewImp::dimension, rangeDim, 1> BaseType;
public:
- typedef typename internal::PdelabBasedProductTraits<GridViewImp, polynomialOrder, RangeFieldImp, rangeDim, 1> Traits;
+ typedef typename internal::DunePdelabDgProductSpaceWrapperTraits<GridViewImp, polynomialOrder, RangeFieldImp,
+ rangeDim, 1> Traits;
using typename BaseType::GridViewType;
using typename BaseType::EntityType;
using typename BaseType::BaseFunctionSetType;
@@ -279,7 +283,7 @@ public:
typedef typename Traits::SpaceTupleType SpaceTupleType;
typedef typename Traits::FactorSpaceType FactorSpaceType;
- PdelabBasedProduct(GridViewType gv)
+ DunePdelabDgProductSpaceWrapper(GridViewType gv)
: grid_view_(gv)
, factor_space_(grid_view_)
, factor_mapper_(factor_space_.backend())
@@ -288,7 +292,7 @@ public:
{
}
- PdelabBasedProduct(const ThisType& other)
+ DunePdelabDgProductSpaceWrapper(const ThisType& other)
: grid_view_(other.grid_view_)
, factor_space_(other.factor_space_)
, factor_mapper_(other.factor_mapper_)
@@ -300,7 +304,7 @@ public:
const auto& DUNE_UNUSED(comm) = this->communicator();
}
- PdelabBasedProduct(ThisType&& source) = default;
+ DunePdelabDgProductSpaceWrapper(ThisType&& source) = default;
ThisType& operator=(const ThisType& other) = delete;
diff --git a/dune/gdt/playground/spaces/dg/pdelabproduct.hh b/dune/gdt/playground/spaces/dg/pdelabproduct.hh
deleted file mode 100644
index d84f5c571..000000000
--- a/dune/gdt/playground/spaces/dg/pdelabproduct.hh
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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)
-//
-// Contributors: Tobias Leibner
-
-#ifndef DUNE_GDT_PLAYGROUND_SPACES_DG_PDELABPRODUCT_HH
-#define DUNE_GDT_PLAYGROUND_SPACES_DG_PDELABPRODUCT_HH
-
-#include <dune/gdt/playground/spaces/mapper/dune-pdelab-wrapper.hh>
-
-namespace Dune {
-namespace GDT {
-namespace Spaces {
-namespace DG {
-
-
-namespace internal {
-
-
-} // namespace internal
-
-
-} // namespace DG
-} // namespace Spaces
-} // namespace GDT
-} // namespace Dune
-
-#endif // DUNE_GDT_PLAYGROUND_SPACES_DG_PDELABPRODUCT_HH
--
GitLab