From 8ee80a96453180b8221cb1c42d2c8ae5440041ef Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 6 Sep 2018 11:11:15 +0200
Subject: [PATCH] Switch to modern style of GeometryType construction
---
test/averagedistanceassemblertest.cc | 2 +-
test/localgfetestfunctiontest.cc | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/test/averagedistanceassemblertest.cc b/test/averagedistanceassemblertest.cc
index 0f49c4a4..5aa37cc1 100644
--- a/test/averagedistanceassemblertest.cc
+++ b/test/averagedistanceassemblertest.cc
@@ -66,7 +66,7 @@ void testWeightSet(const std::vector<TargetSpace>& corners,
int quadOrder = 3;
const Dune::QuadratureRule<double, dim>& quad
- = Dune::QuadratureRules<double, dim>::rule(GeometryType(GeometryType::simplex,dim), quadOrder);
+ = Dune::QuadratureRules<double, dim>::rule(GeometryTypes::simplex(dim), quadOrder);
for (size_t pt=0; pt<quad.size(); pt++) {
diff --git a/test/localgfetestfunctiontest.cc b/test/localgfetestfunctiontest.cc
index 34ff67bd..4b9769c9 100644
--- a/test/localgfetestfunctiontest.cc
+++ b/test/localgfetestfunctiontest.cc
@@ -40,15 +40,12 @@ void test()
PQkLocalFiniteElementCache<double,double,domainDim,1> feCache;
typedef typename PQkLocalFiniteElementCache<double,double,domainDim,1>::FiniteElementType LocalFiniteElement;
- GeometryType simplex;
- simplex.makeSimplex(domainDim);
-
for (int i=0; i<numIndices; i++, ++index) {
for (int j=0; j<domainDim+1; j++)
coefficients[j] = testPoints[index[j]];
- LocalGfeTestFunctionFiniteElement<LocalFiniteElement,TargetSpace> testFunctionSet(feCache.get(simplex),coefficients);
+ LocalGfeTestFunctionFiniteElement<LocalFiniteElement,TargetSpace> testFunctionSet(feCache.get(GeometryTypes::simplex(domainDim)),coefficients);
FieldVector<double,domainDim> stupidTestPoint(0);
--
GitLab