From bd4fe84112cd552d8016453f0278ec6d52fd71d0 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@mi.fu-berlin.de>
Date: Wed, 19 Oct 2011 13:06:14 +0000
Subject: [PATCH] remove the wrapper class and use the new
LocalGFETestFunctionFiniteElement
[[Imported from SVN: r7957]]
---
dune/gfe/globalgfetestfunctionbasis.hh | 41 ++------------------------
1 file changed, 3 insertions(+), 38 deletions(-)
diff --git a/dune/gfe/globalgfetestfunctionbasis.hh b/dune/gfe/globalgfetestfunctionbasis.hh
index b24a93a9..feccfb05 100644
--- a/dune/gfe/globalgfetestfunctionbasis.hh
+++ b/dune/gfe/globalgfetestfunctionbasis.hh
@@ -3,17 +3,7 @@
#include <dune/fufem/functionspacebases/functionspacebasis.hh>
-#include <dune/gfe/localgfetestfunction.hh>
-
-// forward declaration
-//template <class Basis, class TargetSpace
-//class GlobalGFETestFunctionBasis;
-// not sure if this works
-//template <class Basis, class TargetSpace>
-//class GlobalGFETestFunctionBasis<Basis, TargetSpace>::LocalFiniteElement{};
-
-template <class LocalFE, class TargetSpace>
-class LocalTestFunctionWrapper;
+#include <dune/gfe/localgfetestfunctionbasis.hh>
/** \brief A global basis for the gfe test functions.
*
@@ -26,13 +16,12 @@ class GlobalGFETestFunctionBasis : public FunctionSpaceBasis<typename Basis::Gri
public:
typedef typename Basis::GridView GridView;
- typedef LocalTestFunctionWrapper<typename Basis::LocalFiniteElement, TargetSpace> LocalFiniteElement;
+ typedef LocalGFETestFunctionBasis<typename Basis::LocalFiniteElement, TargetSpace> LocalFiniteElement;
private:
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::Grid::ctype ctype;
- typedef GlobalGFETestFunctionBasis<Basis,TargetSpace> This;
- typedef FunctionSpaceBasis<GridView, typename TargetSpace::EmbeddedTangentVector, typename This::LocalFiniteElement> Base;
+ typedef FunctionSpaceBasis<GridView, typename TargetSpace::EmbeddedTangentVector, LocalFiniteElement> Base;
public:
GlobalGFETestFunctionBasis(const Basis& basis, const CoefficientType& baseCoefficients) :
@@ -91,28 +80,4 @@ private:
mutable LocalFiniteElement* lfe_;
};
-/** \brief Struct to wrap the LocalGeodesicTestFunction into a localBasis of a LocalFiniteElement. */
-template <class LocalFE, class TargetSpace>
-class LocalTestFunctionWrapper {
-
- public:
- typedef typename LocalFE::Traits::LocalBasisType::Traits BasisTraits;
- typedef LocalGFETestFunction<BasisTraits::dimDomain,typename BasisTraits::DomainFieldType,LocalFE,TargetSpace> LocalBasisType;
-
- LocalTestFunctionWrapper(const LocalFE& localFiniteElement,
- const std::vector<TargetSpace>& localCoefficients) :
- localGfeTestFunction_(localFiniteElement,localCoefficients)
- {}
-
- /** \brief Get the local Basis. */
- const LocalBasisType& localBasis() const {return localGfeTestFunction_;}
-
- private:
- LocalBasisType localGfeTestFunction_;
-};
-
-
-
-
-
#endif
--
GitLab