Skip to content
Snippets Groups Projects
Commit c1408fdd authored by Karsten Rink's avatar Karsten Rink
Browse files

Merge pull request #499 from endJunction/FixWarningsInMeshLibTests

Fix warnings in MeshLib tests.
parents 85e6c6c0 a740c4c6
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ TEST(IsPntInElement, Line) ...@@ -48,7 +48,7 @@ TEST(IsPntInElement, Line)
{ {
GeoLib::Point pnt; GeoLib::Point pnt;
std::vector<MeshLib::Node*> nodes (createNodes()); std::vector<MeshLib::Node*> nodes (createNodes());
std::array<MeshLib::Node*, 2> line_nodes = { nodes[0], nodes[4] }; std::array<MeshLib::Node*, 2> line_nodes = {{ nodes[0], nodes[4] }};
MeshLib::Line line(line_nodes); MeshLib::Line line(line_nodes);
pnt = GeoLib::Point(0,0,0.7); pnt = GeoLib::Point(0,0,0.7);
ASSERT_EQ(true, line.isPntInElement(pnt)); ASSERT_EQ(true, line.isPntInElement(pnt));
...@@ -61,7 +61,7 @@ TEST(IsPntInElement, Tri) ...@@ -61,7 +61,7 @@ TEST(IsPntInElement, Tri)
{ {
GeoLib::Point pnt; GeoLib::Point pnt;
std::vector<MeshLib::Node*> nodes (createNodes()); std::vector<MeshLib::Node*> nodes (createNodes());
std::array<MeshLib::Node*, 3> tri_nodes = { nodes[0], nodes[1], nodes[4] }; std::array<MeshLib::Node*, 3> tri_nodes = {{ nodes[0], nodes[1], nodes[4] }};
MeshLib::Tri tri(tri_nodes); MeshLib::Tri tri(tri_nodes);
pnt = GeoLib::Point(0.1,0,0.1); pnt = GeoLib::Point(0.1,0,0.1);
...@@ -75,9 +75,10 @@ TEST(IsPntInElement, Quad) ...@@ -75,9 +75,10 @@ TEST(IsPntInElement, Quad)
{ {
GeoLib::Point pnt; GeoLib::Point pnt;
std::vector<MeshLib::Node*> nodes (createNodes()); std::vector<MeshLib::Node*> nodes (createNodes());
std::array<MeshLib::Node*, 4> quad_nodes = { nodes[0], nodes[1], nodes[5], nodes[4] }; std::array<MeshLib::Node*, 4> quad_nodes =
{{ nodes[0], nodes[1], nodes[5], nodes[4] }};
MeshLib::Quad quad(quad_nodes); MeshLib::Quad quad(quad_nodes);
pnt = GeoLib::Point(0.1,0,0.1); pnt = GeoLib::Point(0.1,0,0.1);
ASSERT_EQ(true, quad.isPntInElement(pnt)); ASSERT_EQ(true, quad.isPntInElement(pnt));
pnt = GeoLib::Point(0.999,0,0.001); pnt = GeoLib::Point(0.999,0,0.001);
...@@ -92,7 +93,8 @@ TEST(IsPntInElement, Tet) ...@@ -92,7 +93,8 @@ TEST(IsPntInElement, Tet)
{ {
GeoLib::Point pnt; GeoLib::Point pnt;
std::vector<MeshLib::Node*> nodes (createNodes()); std::vector<MeshLib::Node*> nodes (createNodes());
std::array<MeshLib::Node*, 4> tet_nodes = { nodes[0], nodes[1], nodes[2], nodes[4] }; std::array<MeshLib::Node*, 4> tet_nodes =
{{ nodes[0], nodes[1], nodes[2], nodes[4] }};
MeshLib::Tet tet(tet_nodes); MeshLib::Tet tet(tet_nodes);
pnt = GeoLib::Point(0.5,0.3,0.1); pnt = GeoLib::Point(0.5,0.3,0.1);
...@@ -125,7 +127,8 @@ TEST(IsPntInElement, Prism) ...@@ -125,7 +127,8 @@ TEST(IsPntInElement, Prism)
{ {
GeoLib::Point pnt; GeoLib::Point pnt;
std::vector<MeshLib::Node*> nodes (createNodes()); std::vector<MeshLib::Node*> nodes (createNodes());
std::array<MeshLib::Node*, 6> prism_nodes = { nodes[0], nodes[1], nodes[2], nodes[4], nodes[5], nodes[6] }; std::array<MeshLib::Node*, 6> prism_nodes =
{{ nodes[0], nodes[1], nodes[2], nodes[4], nodes[5], nodes[6] }};
MeshLib::Prism prism(prism_nodes); MeshLib::Prism prism(prism_nodes);
pnt = GeoLib::Point(0.5,0.5,0.1); pnt = GeoLib::Point(0.5,0.5,0.1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment