From e794969d5494d727f834d45ff86fec3c7d36f853 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 21 Dec 2017 11:24:20 +0100
Subject: [PATCH] Adapt to new GeometryType interface
---
test/localprojectedfefunctiontest.cc | 35 ++++++++++++----------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/test/localprojectedfefunctiontest.cc b/test/localprojectedfefunctiontest.cc
index ba3a7649..7d266d62 100644
--- a/test/localprojectedfefunctiontest.cc
+++ b/test/localprojectedfefunctiontest.cc
@@ -247,39 +247,34 @@ int main()
std::cout << std::setw(15) << std::setprecision(12);
- GeometryType element;
-
////////////////////////////////////////////////////////////////
// Test functions on 1d elements
////////////////////////////////////////////////////////////////
- element.makeSimplex(1);
- test<RealTuple<double,1>,1>(element);
- test<UnitVector<double,2>,1>(element);
- test<UnitVector<double,3>,1>(element);
- test<Rotation<double,3>,1>(element);
- test<RigidBodyMotion<double,3>,1>(element);
+ test<RealTuple<double,1>,1>(GeometryTypes::line);
+ test<UnitVector<double,2>,1>(GeometryTypes::line);
+ test<UnitVector<double,3>,1>(GeometryTypes::line);
+ test<Rotation<double,3>,1>(GeometryTypes::line);
+ test<RigidBodyMotion<double,3>,1>(GeometryTypes::line);
////////////////////////////////////////////////////////////////
// Test functions on 2d simplex elements
////////////////////////////////////////////////////////////////
- element.makeSimplex(2);
- test<RealTuple<double,1>,2>(element);
- test<UnitVector<double,2>,2>(element);
- test<UnitVector<double,3>,2>(element);
- test<Rotation<double,3>,2>(element);
- test<RigidBodyMotion<double,3>,2>(element);
+ test<RealTuple<double,1>,2>(GeometryTypes::triangle);
+ test<UnitVector<double,2>,2>(GeometryTypes::triangle);
+ test<UnitVector<double,3>,2>(GeometryTypes::triangle);
+ test<Rotation<double,3>,2>(GeometryTypes::triangle);
+ test<RigidBodyMotion<double,3>,2>(GeometryTypes::triangle);
////////////////////////////////////////////////////////////////
// Test functions on 2d quadrilateral elements
////////////////////////////////////////////////////////////////
- element.makeCube(2);
- test<RealTuple<double,1>,2>(element);
- test<UnitVector<double,2>,2>(element);
- test<UnitVector<double,3>,2>(element);
- test<Rotation<double,3>,2>(element);
- test<RigidBodyMotion<double,3>,2>(element);
+ test<RealTuple<double,1>,2>(GeometryTypes::quadrilateral);
+ test<UnitVector<double,2>,2>(GeometryTypes::quadrilateral);
+ test<UnitVector<double,3>,2>(GeometryTypes::quadrilateral);
+ test<Rotation<double,3>,2>(GeometryTypes::quadrilateral);
+ test<RigidBodyMotion<double,3>,2>(GeometryTypes::quadrilateral);
}
--
GitLab