From de889a67d99b02451a72adef96549ee98e9ddc69 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 6 Jun 2012 11:43:37 +0200
Subject: [PATCH] Use new alugrid interface
To be precise: replace
ALUSimplexGrid<dim,dim>
with
ALUGrid<dim, dim, simplex, nonconforming>
---
src/assemblers_tmpl.cc | 4 ++--
src/mysolver_tmpl.cc | 4 ++--
src/one-body-sample.cc | 4 +++-
src/vtk_tmpl.cc | 4 ++--
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc
index 6123cd5f..a66a89c9 100644
--- a/src/assemblers_tmpl.cc
+++ b/src/assemblers_tmpl.cc
@@ -11,7 +11,7 @@ typedef Dune::FieldMatrix<double, 2, 2> SmallMatrix2;
typedef Dune::BCRSMatrix<SmallMatrix2> OperatorType2;
typedef Dune::BlockVector<SmallVector2> VectorType2;
-typedef Dune::ALUSimplexGrid<2, 2> GridType2;
+typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming> GridType2;
// typedef Dune::YaspGrid<2> GridType2;
typedef GridType2::LeafGridView GridView2;
typedef P1NodalBasis<GridView2, double> P1Basis2;
@@ -43,7 +43,7 @@ typedef Dune::FieldMatrix<double, 3, 3> SmallMatrix3;
typedef Dune::BCRSMatrix<SmallMatrix3> OperatorType3;
typedef Dune::BlockVector<SmallVector3> VectorType3;
-typedef Dune::ALUSimplexGrid<3, 3> GridType3;
+typedef Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming> GridType3;
// typedef Dune::YaspGrid<3> GridType3;
typedef GridType3::LeafGridView GridView3;
typedef P1NodalBasis<GridView3, double> P1Basis3;
diff --git a/src/mysolver_tmpl.cc b/src/mysolver_tmpl.cc
index a5b7b601..4bf91b21 100644
--- a/src/mysolver_tmpl.cc
+++ b/src/mysolver_tmpl.cc
@@ -17,7 +17,7 @@ typedef Dune::BCRSMatrix<SmallMatrix2> OperatorType2;
typedef MyConvexProblem<OperatorType2, VectorType2> MyConvexProblemType2;
typedef MyBlockProblem<MyConvexProblemType2> MyBlockProblemType2;
-typedef Dune::ALUSimplexGrid<2, 2> GridType2;
+typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming> GridType2;
// typedef Dune::YaspGrid<2> GridType2;
template class MySolver<2, VectorType2, OperatorType2, GridType2,
@@ -33,7 +33,7 @@ typedef Dune::BCRSMatrix<SmallMatrix3> OperatorType3;
typedef MyConvexProblem<OperatorType3, VectorType3> MyConvexProblemType3;
typedef MyBlockProblem<MyConvexProblemType3> MyBlockProblemType3;
-typedef Dune::ALUSimplexGrid<3, 3> GridType3;
+typedef Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming> GridType3;
// typedef Dune::YaspGrid<3> GridType3;
template class MySolver<3, VectorType3, OperatorType3, GridType3,
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 9d2f7541..8779d0df 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -147,7 +147,9 @@ int main(int argc, char *argv[]) {
verbose ? Solver::FULL : Solver::QUIET;
// {{{ Set up grid
- typedef Dune::ALUSimplexGrid<dim, dim> GridType;
+
+ typedef Dune::ALUGrid<dim, dim, Dune::simplex, Dune::nonconforming>
+ GridType;
Dune::FieldVector<typename GridType::ctype, dim> lowerLeft(0);
Dune::FieldVector<typename GridType::ctype, dim> upperRight(1);
Dune::array<unsigned int, dim> elements;
diff --git a/src/vtk_tmpl.cc b/src/vtk_tmpl.cc
index 182f51b6..73bb3237 100644
--- a/src/vtk_tmpl.cc
+++ b/src/vtk_tmpl.cc
@@ -16,7 +16,7 @@ typedef Dune::FieldVector<double, 2> SmallVector2;
typedef Dune::FieldMatrix<double, 2, 2> SmallMatrix2;
typedef Dune::BlockVector<SmallVector2> VectorType2;
-typedef Dune::ALUSimplexGrid<2, 2> GridType2;
+typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming> GridType2;
// typedef Dune::YaspGrid<2> GridType2;
typedef GridType2::LeafGridView GridView2;
typedef P1NodalBasis<GridView2, double> P1Basis2;
@@ -35,7 +35,7 @@ typedef Dune::FieldVector<double, 3> SmallVector3;
typedef Dune::FieldMatrix<double, 3, 3> SmallMatrix3;
typedef Dune::BlockVector<SmallVector3> VectorType3;
-typedef Dune::ALUSimplexGrid<3, 3> GridType3;
+typedef Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming> GridType3;
// typedef Dune::YaspGrid<3> GridType3;
typedef GridType3::LeafGridView GridView3;
typedef P1NodalBasis<GridView3, double> P1Basis3;
--
GitLab