From 5ba406e600e3fae9cde6439d23c2da7bb8da9e43 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Mon, 14 Jul 2014 22:17:41 +0200
Subject: [PATCH] Use a dune-2.3-style constructor for YaspGrid
---
dune/solvers/test/mmgtest.cc | 6 +++---
dune/solvers/test/obstacletnnmgtest.cc | 6 +++---
dune/solvers/test/quadraticipoptsolvertest.cc | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dune/solvers/test/mmgtest.cc b/dune/solvers/test/mmgtest.cc
index c10f409e..24f71f67 100644
--- a/dune/solvers/test/mmgtest.cc
+++ b/dune/solvers/test/mmgtest.cc
@@ -167,10 +167,10 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
typedef Dune::YaspGrid<dim> GridType;
typename Dune::FieldVector<typename GridType::ctype,dim> L(1.0);
- typename Dune::FieldVector<int,dim> s(1);
- typename Dune::FieldVector<bool,dim> periodic(false);
+ typename Dune::array<int,dim> s;
+ std::fill(s.begin(), s.end(), 1);
- GridType grid(L, s, periodic, 0);
+ GridType grid(L, s);
for (int i = 0; i < refine; ++i)
grid.globalRefine(1);
diff --git a/dune/solvers/test/obstacletnnmgtest.cc b/dune/solvers/test/obstacletnnmgtest.cc
index dd90cde8..d24ec9e1 100644
--- a/dune/solvers/test/obstacletnnmgtest.cc
+++ b/dune/solvers/test/obstacletnnmgtest.cc
@@ -168,10 +168,10 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
typedef Dune::YaspGrid<dim> GridType;
typename Dune::FieldVector<typename GridType::ctype,dim> L(1.0);
- typename Dune::FieldVector<int,dim> s(1);
- typename Dune::FieldVector<bool,dim> periodic(false);
+ typename Dune::array<int,dim> s;
+ std::fill(s.begin(), s.end(), 1);
- GridType grid(L, s, periodic, 0);
+ GridType grid(L, s);
for (int i = 0; i < refine; ++i)
grid.globalRefine(1);
diff --git a/dune/solvers/test/quadraticipoptsolvertest.cc b/dune/solvers/test/quadraticipoptsolvertest.cc
index a7281954..b8b5f1e1 100644
--- a/dune/solvers/test/quadraticipoptsolvertest.cc
+++ b/dune/solvers/test/quadraticipoptsolvertest.cc
@@ -145,10 +145,10 @@ bool checkWithYaspGrid(int refine, const std::string fileName="")
typedef Dune::YaspGrid<dim> GridType;
typename Dune::FieldVector<typename GridType::ctype,dim> L(1.0);
- typename Dune::FieldVector<int,dim> s(1);
- typename Dune::FieldVector<bool,dim> periodic(false);
+ typename Dune::array<int,dim> s;
+ std::fill(s.begin(), s.end(), 1);
- GridType grid(L, s, periodic, 0);
+ GridType grid(L, s);
for (int i = 0; i < refine; ++i)
grid.globalRefine(1);
--
GitLab