From 9b3530ead886b065d2532c6d65daa7b55a896b8f Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Mon, 27 Jul 2015 08:06:11 +0200
Subject: [PATCH] Use className(*grid) to get the name of the grid
implementation class
Rather than having the names as explicit strings in the code. This
avoids copy'n'paste errors, and makes the code slightly shorter.
---
dune/solvers/test/common.hh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dune/solvers/test/common.hh b/dune/solvers/test/common.hh
index a13d05d7..66973e10 100644
--- a/dune/solvers/test/common.hh
+++ b/dune/solvers/test/common.hh
@@ -364,7 +364,7 @@ void markBoundaryDOFs(const GridView& gridView, BitVector& isBoundary)
template<class GridType, class TestSuite>
-bool checkWithGrid(TestSuite& suite, int uniformRefinements, std::string name)
+bool checkWithGrid(TestSuite& suite, int uniformRefinements)
{
const int dim=GridType::dimension;
Dune::FieldVector<double,dim> lower(0);
@@ -382,11 +382,11 @@ bool checkWithGrid(TestSuite& suite, int uniformRefinements, std::string name)
grid->globalRefine(uniformRefinements);
- std::cout << "Running test on " << name << " with " << grid->size(0) << " elements." << std::endl;
+ std::cout << "Running test on " << Dune::className(*grid) << " with " << grid->size(0) << " elements." << std::endl;
bool passed = suite.check(*grid);
if (passed)
- std::cout << "All tests passed with " << name << "." << std::endl;
+ std::cout << "All tests passed with " << Dune::className(*grid) << "." << std::endl;
return passed;
}
@@ -396,16 +396,16 @@ bool checkWithStandardGrids(TestSuite& suite)
{
bool passed = true;
- passed = passed and checkWithGrid<Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<double,2> > >(suite, 2, "YaspGrid<2>");
+ passed = passed and checkWithGrid<Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<double,2> > >(suite, 2);
#if HAVE_UG
- passed = passed and checkWithGrid<Dune::UGGrid<2> >(suite, 5, "UGGrid<2>");
- passed = passed and checkWithGrid<Dune::UGGrid<3> >(suite, 3, "UGGrid<3>");
+ passed = passed and checkWithGrid<Dune::UGGrid<2> >(suite, 5);
+ passed = passed and checkWithGrid<Dune::UGGrid<3> >(suite, 3);
#endif
#if HAVE_ALUGRID
- passed = passed and checkWithGrid<Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming>>(suite, 5, "ALUSimplexGrid<2,2>");
-// passed = passed and checkWithGrid<Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming>>(suite, 3, "ALUSimplexGrid<3,3>");
+ passed = passed and checkWithGrid<Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming>>(suite, 5);
+// passed = passed and checkWithGrid<Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming>>(suite, 3);
#endif
return passed;
--
GitLab