Commit 217c3d03 authored by Carsten Gräser's avatar Carsten Gräser

[cleanup] Stop using deprecated `LocalBasisFunctionInterface`.

parent 71fe515e
Pipeline #28163 passed with stage
in 47 minutes and 13 seconds
......@@ -14,7 +14,6 @@
#include <dune/matrix-vector/addtodiagonal.hh>
#include <dune/fufem/functions/cachedcomponentwrapper.hh>
#include <dune/localfunctions/common/virtualinterface.hh>
/** \brief Wrapper that extracts a single local basis function. */
template<class LocalBasis, class Base>
......@@ -68,8 +67,8 @@ static void assembleBasisInterpolationMatrix(MatrixType& matrix, const BasisType
typedef typename BasisType0::LocalFiniteElement FEType0;
typedef typename BasisType1::LocalFiniteElement FEType1;
typedef typename Dune::LocalFiniteElementFunctionBase<FEType0>::type FunctionBaseClass;
typedef LocalBasisComponentWrapper<typename FEType0::Traits::LocalBasisType, FunctionBaseClass> LocalBasisWrapper;
typedef typename FEType0::Traits::LocalBasisType::Traits FunctionTraits;
typedef LocalBasisComponentWrapper<typename FEType0::Traits::LocalBasisType, FunctionTraits> LocalBasisWrapper;
matrix.setSize(rows,cols);
matrix.setBuildMode(MatrixType::random);
......@@ -229,8 +228,6 @@ class OtherGeometryWrapper
public:
using Traits = typename Function::Traits;
OtherGeometryWrapper(const Function& function, const Geometry& geometry)
: function_(function)
, geometry_(geometry)
......@@ -313,8 +310,8 @@ static void assembleGlobalBasisTransferMatrix(MatrixType& matrix,
DUNE_THROW(Dune::Exception, "currently, we can handle power nodes only");
using CoarseFEType = typename decltype(coarseLocalView)::Tree::FiniteElement;
using FunctionBaseClass = typename Dune::LocalFiniteElementFunctionBase<CoarseFEType>::type;
using LocalBasisWrapper = LocalBasisComponentWrapper<typename CoarseFEType::Traits::LocalBasisType, FunctionBaseClass>;
typedef typename CoarseFEType::Traits::LocalBasisType::Traits FunctionTraits;
using LocalBasisWrapper = LocalBasisComponentWrapper<typename CoarseFEType::Traits::LocalBasisType, FunctionTraits>;
matrix.setSize(rows,cols);
matrix.setBuildMode(MatrixType::random);
......
......@@ -33,8 +33,8 @@ class AdolcHessianAssembler :
typedef VirtualGridFunction<GridType, Dune::FieldVector<field_type,blocksize> > GridFunction;
typedef typename Dune::LocalFiniteElementFunctionBase<TrialLocalFE>::type FunctionBaseClass;
typedef LocalFunctionComponentWrapper<GridFunction, GridType, FunctionBaseClass> LocalWrapper;
typedef typename TrialLocalFE::Traits::LocalBasisType::Traits FunctionTraits;
typedef LocalFunctionComponentWrapper<GridFunction, GridType, FunctionTraits> LocalWrapper;
public:
typedef typename Base::Element Element;
......
......@@ -29,8 +29,8 @@ class AdolcLinearizationAssembler :
typedef VirtualGridFunction<GridType, T> GridFunction;
typedef typename Dune::LocalFiniteElementFunctionBase<TrialLocalFE>::type FunctionBaseClass;
typedef LocalFunctionComponentWrapper<GridFunction, GridType, FunctionBaseClass> LocalWrapper;
typedef typename TrialLocalFE::Traits::LocalBasisType::Traits FunctionTraits;
typedef LocalFunctionComponentWrapper<GridFunction, GridType, FunctionTraits> LocalWrapper;
public:
typedef typename Base::Element Element;
......
......@@ -8,8 +8,6 @@
#include <dune/geometry/quadraturerules.hh>
#include <dune/geometry/referenceelements.hh>
#include <dune/localfunctions/common/virtualinterface.hh>
#include <dune/istl/matrix.hh>
#include <dune/fufem/functions/localbasisderivativefunction.hh>
......@@ -57,9 +55,9 @@ class GradientAssembler
// get transposed inverse of Jacobian of transformation
const FMdimdim& invJacobian = geometry.jacobianInverseTransposed(pos);
typedef typename Dune::LocalFiniteElementFunctionBase<TrialLocalFE>::type FunctionBaseClass;
typedef typename TrialLocalFE::Traits::LocalBasisType::Traits FunctionTraits;
LocalBasisDerivativeFunction<AnsatzLocalFE, FunctionBaseClass> derivative(aFE.localBasis());
LocalBasisDerivativeFunction<AnsatzLocalFE, FunctionTraits> derivative(aFE.localBasis());
std::vector<JacobianType> referenceGradients(tFE.localBasis().size());
......
......@@ -114,11 +114,10 @@ struct Components<typename std::vector<T> >
* by providing a cache for the evaluation of all functions.
*
* \tparam Imp Implementation providing the evaluateAll method
* \tparam FunctionBaseClass The base class for this wrapper
* \tparam FunctionBaseClass This once was used as a base class. Now it just provides DomainType and RangeType
*/
template <class Imp, class AllRangeType, class FunctionBaseClass>
class CachedComponentWrapper :
public FunctionBaseClass
class CachedComponentWrapper
{
public:
typedef typename FunctionBaseClass::DomainType DomainType;
......
......@@ -8,8 +8,6 @@
#include <dune/common/bitsetvector.hh>
#include <dune/common/fvector.hh>
#include <dune/localfunctions/common/virtualinterface.hh>
#include "dune/fufem/functions/alienelementlocalbasisfunction.hh"
......@@ -124,9 +122,9 @@ class DOFConstraints {
const auto& nLocalBasis = basis.getLocalFiniteElement(neighbor).localBasis();
typedef typename Dune::LocalFiniteElementFunctionBase<FE>::type FunctionBaseClass;
typedef typename FE::Traits::LocalBasisType::Traits FunctionTraits;
AlienElementLocalBasisFunction<Element, FE, FunctionBaseClass> f(element, neighbor, nLocalBasis);
AlienElementLocalBasisFunction<Element, FE, FunctionTraits> f(element, neighbor, nLocalBasis);
std::vector<double> interpolationValues(localBasis.size());
......
......@@ -115,8 +115,8 @@ struct BasisInterpolator
static void interpolate(const B& basis, RepresentationType& coeff, const F& f, const BitVectorType& interpolateDOFFlags)
{
typedef typename B::LocalFiniteElement LocalFiniteElement;
typedef typename Dune::LocalFiniteElementFunctionBase<LocalFiniteElement>::type FunctionBaseClass;
typedef LocalFunctionComponentWrapper<F, Grid, FunctionBaseClass> LocalWrapper;
typedef typename LocalFiniteElement::Traits::LocalBasisType::Traits FunctionTraits;
typedef LocalFunctionComponentWrapper<F, Grid, FunctionTraits> LocalWrapper;
const GridView& gridview = basis.getGridView();
......
Markdown is supported
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