From d3fc0aa14f881cbbb9a01474158250f264221e9c Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Wed, 25 Jul 2012 07:18:22 +0000
Subject: [PATCH] Change declaration of ALUGrids according to the new way
introduced by Dune 2.2 (reviewed and corrected by mwolff)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8724 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh | 2 +-
test/boxmodels/1p/1ptestproblem.hh | 2 +-
test/freeflow/navierstokes/navierstokestestproblem.hh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh b/dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh
index 8d0d76acb0..d612552e94 100644
--- a/dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh
+++ b/dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh
@@ -84,7 +84,7 @@ struct GridImp<Dune::SGrid<dim, dim>, dim>
#if HAVE_ALUGRID
template<int dim>
-struct GridImp<Dune::ALUCubeGrid<dim, dim>, dim>
+struct GridImp<Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming>, dim>
{
static const int imp = GridTypes::aluGrid;
};
diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 3053c3de17..a29ca1190c 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -69,7 +69,7 @@ SET_PROP(OnePTestProblem, Grid)
typedef Dune::SGrid<2, 2> type;
//typedef Dune::YaspGrid<2> type;
//typedef Dune::UGGrid<2> type;
- //typedef Dune::ALUSimplexGrid<2,2> type;
+ //typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming> type;
};
// Set the problem property
diff --git a/test/freeflow/navierstokes/navierstokestestproblem.hh b/test/freeflow/navierstokes/navierstokestestproblem.hh
index 280c09efe0..193c82815e 100644
--- a/test/freeflow/navierstokes/navierstokestestproblem.hh
+++ b/test/freeflow/navierstokes/navierstokestestproblem.hh
@@ -59,7 +59,7 @@ namespace Dumux
// Set the grid type
#if HAVE_ALUGRID
- SET_TYPE_PROP(NavierStokesTestProblem, Grid, Dune::ALUCubeGrid<2,2>);
+ SET_TYPE_PROP(NavierStokesTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
#elif HAVE_UG
SET_TYPE_PROP(NavierStokesTestProblem, Grid, Dune::UGGrid<2>);
#endif
--
GitLab