Skip to content
Snippets Groups Projects
Commit 4a4c9af4 authored by Dominic Kempf's avatar Dominic Kempf
Browse files

namespace istl->ISTL

To comply with latest pdelab.
parent bec9c8f4
No related branches found
No related tags found
No related merge requests found
......@@ -362,9 +362,9 @@ def typedef_vectorbackend(name, element):
include_file("dune/pdelab/backend/istl.hh", filetag="driver")
if get_option("fastdg"):
blocksize = name_blocksize(element)
return "using {} = Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed, {}>;".format(name, blocksize)
return "using {} = Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::fixed, {}>;".format(name, blocksize)
else:
return "using {} = Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::none, 1>;".format(name)
return "using {} = Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::none, 1>;".format(name)
def type_vectorbackend(element):
......
......@@ -134,7 +134,7 @@ def name_dofestimate():
@preamble
def typedef_matrixbackend(name):
include_file("dune/pdelab/backend/istl.hh", filetag="driver")
return "using {} = Dune::PDELab::istl::BCRSMatrixBackend<>;".format(name)
return "using {} = Dune::PDELab::ISTL::BCRSMatrixBackend<>;".format(name)
def type_matrixbackend():
......
......@@ -30,7 +30,7 @@ void driver (const GV& gv, const FEM& fem, Dune::ParameterTree& ptree)
// Make grid function space
typedef Dune::PDELab::ConformingDirichletConstraints CON;
typedef Dune::PDELab::istl::VectorBackend<> VBE;
typedef Dune::PDELab::ISTL::VectorBackend<> VBE;
typedef Dune::PDELab::GridFunctionSpace<GV,FEM,CON,VBE> GFS;
GFS gfs(gv,fem);
gfs.name("Vh");
......@@ -63,7 +63,7 @@ void driver (const GV& gv, const FEM& fem, Dune::ParameterTree& ptree)
// LOP lop(ptree, params_poisson);
typedef Dune::PDELab::istl::BCRSMatrixBackend<> MBE;
typedef Dune::PDELab::ISTL::BCRSMatrixBackend<> MBE;
int degree = ptree.get("fem.degree",(int)1);
MBE mbe((int)pow(1+2*degree,dim));
typedef Dune::PDELab::GridOperator<GFS,GFS,LOP,MBE,
......
......@@ -88,7 +88,7 @@ class CDProb
};
void driver(int argc, char** argv){ typedef Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::none, 1> VectorBackend;
void driver(int argc, char** argv){ typedef Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::none, 1> VectorBackend;
static const int dim = 2;
typedef Dune::UGGrid<dim> Grid;
typedef Grid::LeafGridView GV;
......@@ -110,7 +110,7 @@ void driver(int argc, char** argv){ typedef Dune::PDELab::istl::VectorBackend<D
VTKWriter vtkwriter(gv, sublevel);
using LOP = Dune::PDELab::ConvectionDiffusionDG<CDProb<GV, R>, DG1_FEM>;
typedef DG1_DIRICHLET_GFS::ConstraintsContainer<R>::Type DG1_CC;
typedef Dune::PDELab::istl::BCRSMatrixBackend<> MatrixBackend;
typedef Dune::PDELab::ISTL::BCRSMatrixBackend<> MatrixBackend;
typedef Dune::PDELab::GridOperator<DG1_DIRICHLET_GFS, DG1_DIRICHLET_GFS, LOP, MatrixBackend, DF, R, R, DG1_CC, DG1_CC> GO;
typedef GO::Traits::Domain V;
V x(dg1_dirichlet_gfs);
......
......@@ -56,7 +56,7 @@ void driver (int argc, char** argv){
typedef Dune::PDELab::PkLocalFiniteElementMap<GV,DF,double,1> FEM;
FEM fem(gv);
typedef Dune::PDELab::ConformingDirichletConstraints CON;
typedef Dune::PDELab::istl::VectorBackend<> VBE;
typedef Dune::PDELab::ISTL::VectorBackend<> VBE;
typedef Dune::PDELab::GridFunctionSpace<GV,FEM,CON,VBE> GFS;
GFS gfs(gv,fem);
gfs.name("Vh");
......@@ -85,7 +85,7 @@ void driver (int argc, char** argv){
LOP lop(problem);
// Make a global operator
typedef Dune::PDELab::istl::BCRSMatrixBackend<> MBE;
typedef Dune::PDELab::ISTL::BCRSMatrixBackend<> MBE;
int degree = initree.get("fem.degree",(int)1);
MBE mbe((int)pow(1+2*degree,dim));
typedef Dune::PDELab::GridOperator<
......
......@@ -94,7 +94,7 @@ class CDProb
};
void driver(int argc, char** argv){ typedef Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::none, 1> VectorBackend;
void driver(int argc, char** argv){ typedef Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::none, 1> VectorBackend;
static const int dim = 2;
typedef Dune::UGGrid<dim> Grid;
typedef Grid::LeafGridView GV;
......@@ -116,7 +116,7 @@ void driver(int argc, char** argv){ typedef Dune::PDELab::istl::VectorBackend<D
VTKWriter vtkwriter(gv, sublevel);
using LOP = Dune::PDELab::ConvectionDiffusionDG<CDProb<GV, R>, DG1_FEM>;
typedef DG1_DIRICHLET_GFS::ConstraintsContainer<R>::Type DG1_CC;
typedef Dune::PDELab::istl::BCRSMatrixBackend<> MatrixBackend;
typedef Dune::PDELab::ISTL::BCRSMatrixBackend<> MatrixBackend;
typedef Dune::PDELab::GridOperator<DG1_DIRICHLET_GFS, DG1_DIRICHLET_GFS, LOP, MatrixBackend, DF, R, R, DG1_CC, DG1_CC> GO;
typedef GO::Traits::Domain V;
V x(dg1_dirichlet_gfs);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment