Commit 80421d76 authored by Lukas Riedel's avatar Lukas Riedel

Update code base to DUNE v2.6

* Set blocking sizes for vector backends
    - QkDG is falsely set to 1 due to runtime error
* Use namespace PDELab::ISTL instead of PDELab::istl
* Use new MCMGMapper constructor with layout functor
* Use Dune::GeometryTypes for FEM construction
* Remove includes of deprecated header
    <dune/pdelab/common/referenceelements.hh>
* Fix bug where MatrixBackend in AdaptivityHandler would store entries
    per row as double
parent 69431c58
......@@ -48,7 +48,7 @@ private:
/// Solution vector type
using U0 = Dune::PDELab::Backend::Vector<AGFS,RF>;
/// Matrix backend type
using MBE = Dune::PDELab::istl::BCRSMatrixBackend<RF>;
using MBE = Dune::PDELab::ISTL::BCRSMatrixBackend<>;
/// Grid operator for Error LOP
using ESTGO = Dune::PDELab::GridOperator<GFS,AGFS,ESTLOP,MBE,RF,RF,RF,NoTrafo,NoTrafo>;
......
......@@ -55,7 +55,7 @@ protected:
// -- DUNE Class Defintions -- //
/// Matrix backend type
using MBE = Dune::PDELab::istl::BCRSMatrixBackend<>;
using MBE = Dune::PDELab::ISTL::BCRSMatrixBackend<>;
/// Grid operator for spatial LOP
using GO0 = Dune::PDELab::GridOperator<GFS,GFS,SLOP,MBE,RF,RF,RF,CC,CC>;
/// Grid operator for temporal LOP
......
......@@ -55,7 +55,7 @@ public:
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
using Type = typename Dune::PDELab::GridFunctionSpace<ES,FEM,CON,
Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed>>;
Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::fixed, 1>>;
/// GFS Constraints Container type
using CC = typename Type::template ConstraintsContainer<RF>::Type;
......@@ -63,9 +63,7 @@ public:
static Type create (const GridView& gv)
{
ES es(gv);
Dune::GeometryType geo;
geo.makeSimplex(dim);
auto fem = std::make_shared<FEM>(geo);
auto fem = std::make_shared<FEM>(Dune::GeometryTypes::simplex(dim));
auto con = std::make_shared<CON>();
return Type(es,fem,con);
}
......@@ -88,7 +86,7 @@ public:
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
using Type = typename Dune::PDELab::GridFunctionSpace<ES,FEM,CON,
Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed> >;
Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::fixed, 1>>;
/// GFS Constraints Container type
using CC = typename Type::template ConstraintsContainer<RF>::Type;
......@@ -96,9 +94,7 @@ public:
static Type create (const GridView& gv)
{
ES es(gv);
Dune::GeometryType geo;
geo.makeCube(dim);
auto fem = std::make_shared<FEM>(geo);
auto fem = std::make_shared<FEM>(Dune::GeometryTypes::cube(dim));
auto con = std::make_shared<CON>();
return Type(es,fem,con);
}
......@@ -128,7 +124,12 @@ public:
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
using Type = typename Dune::PDELab::GridFunctionSpace<ES,FEM,CON,
Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed>>;
Dune::PDELab::ISTL::VectorBackend<
Dune::PDELab::ISTL::Blocking::fixed,
Dune::PB::pk_size(order, dim)
>
>;
/// GFS Constraints Container type
using CC = typename Type::template ConstraintsContainer<RF>::Type;
......@@ -159,7 +160,8 @@ public:
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
using Type = typename Dune::PDELab::GridFunctionSpace<ES,FEM,CON,
Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed> >;
Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::fixed, 1>
>;
/// GFS Constraints Container type
using CC = typename Type::template ConstraintsContainer<RF>::Type;
......
......@@ -3,7 +3,9 @@
#define DUNE_DORIE_RICHARDS_OPERATOR_HH
#include<dune/geometry/referenceelements.hh>
#include<dune/pdelab/common/referenceelements.hh>
#include <dune/grid/common/mcmgmapper.hh>
#include<dune/pdelab/common/quadraturerules.hh>
#include<dune/pdelab/localoperator/pattern.hh>
#include<dune/pdelab/localoperator/flags.hh>
......@@ -190,7 +192,8 @@ public:
: Dune::PDELab::NumericalJacobianVolume<RichardsDGSpatialOperator<Traits,Parameter,Boundary,SourceTerm,FEM,adjoint> >(1.e-7),
Dune::PDELab::NumericalJacobianSkeleton<RichardsDGSpatialOperator<Traits,Parameter,Boundary,SourceTerm,FEM,adjoint> >(1.e-7),
Dune::PDELab::NumericalJacobianBoundary<RichardsDGSpatialOperator<Traits,Parameter,Boundary,SourceTerm,FEM,adjoint> >(1.e-7),
param(param_), boundary(boundary_), sourceTerm(sourceTerm_), method(method_), upwinding(upwinding_), weights(weights_), mapper(view_),
param(param_), boundary(boundary_), sourceTerm(sourceTerm_), method(method_), upwinding(upwinding_), weights(weights_),
mapper(view_, Dune::mcmgElementLayout()),
intorderadd(intorderadd_), quadrature_factor(quadrature_factor_),
penalty_factor(config.get<RF>("dg.penaltyFactor")),
time(0.0),
......
......@@ -2,7 +2,7 @@
#define DUNE_DORIE_ERROR_INDICATOR_HH
#include<dune/geometry/referenceelements.hh>
#include<dune/pdelab/common/referenceelements.hh>
#include<dune/pdelab/common/quadraturerules.hh>
#include<dune/pdelab/localoperator/pattern.hh>
#include<dune/pdelab/localoperator/flags.hh>
......
......@@ -4,7 +4,7 @@
#include <algorithm>
#include <dune/geometry/referenceelements.hh>
#include <dune/pdelab/common/referenceelements.hh>
#include <dune/pdelab/common/quadraturerules.hh>
#include <dune/pdelab/localoperator/pattern.hh>
#include <dune/pdelab/localoperator/flags.hh>
......
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