Skip to content
Snippets Groups Projects
Commit 3e0ef044 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

[MeL] getEdge and getFace use bulk elements id.

Before the id was (by default) set to std::size_t(-1).
parent b799704e
No related branches found
No related tags found
No related merge requests found
......@@ -25,7 +25,7 @@ const Element* LinearEdgeReturn::getEdge(const Element* e, unsigned i)
auto** nodes = new Node*[2];
nodes[0] = const_cast<Node*>(e->getEdgeNode(i,0));
nodes[1] = const_cast<Node*>(e->getEdgeNode(i,1));
return new Line(nodes);
return new Line(nodes, e->getID());
}
ERR("Error in MeshLib::Element::getEdge() - Index does not exist.");
return nullptr;
......@@ -39,7 +39,7 @@ const Element* QuadraticEdgeReturn::getEdge(const Element* e, unsigned i)
nodes[0] = const_cast<Node*>(e->getEdgeNode(i,0));
nodes[1] = const_cast<Node*>(e->getEdgeNode(i,1));
nodes[2] = const_cast<Node*>(e->getEdgeNode(i,2));
return new Line3(nodes);
return new Line3(nodes, e->getID());
}
ERR("Error in MeshLib::Element::getEdge() - Index does not exist.");
return nullptr;
......
......@@ -50,7 +50,7 @@ const Element* HexRule20::getFace(const Element* e, unsigned i)
std::array<Node*, 8> nodes;
for (unsigned j=0; j<8; j++)
nodes[j] = const_cast<Node*>(e->getNode(face_nodes[i][j]));
return new Quad8(nodes);
return new Quad8(nodes, e->getID());
}
ERR("Error in MeshLib::Element::getFace() - Index %d does not exist.", i);
return nullptr;
......
......@@ -54,7 +54,7 @@ const Element* HexRule8::getFace(const Element* e, unsigned i)
std::array<Node*, 4> nodes;
for (unsigned j=0; j<4; j++)
nodes[j] = const_cast<Node*>(e->getNode(face_nodes[i][j]));
return new Quad(nodes);
return new Quad(nodes, e->getID());
}
ERR("Error in MeshLib::Element::getFace() - Index %d does not exist.", i);
return nullptr;
......
......@@ -51,7 +51,7 @@ const Element* PrismRule15::getFace(const Element* e, unsigned i)
nodes[j] = const_cast<Node*>(e->getNode(face_nodes[i][j]));
if (i == 0 || i == 4)
return new Tri6(nodes);
return new Tri6(nodes, e->getID());
return new Quad8(nodes);
}
......
......@@ -53,7 +53,7 @@ const Element* PrismRule6::getFace(const Element* e, unsigned i)
nodes[j] = const_cast<Node*>(e->getNode(face_nodes[i][j]));
if (i == 0 || i == 4)
return new Tri(nodes);
return new Tri(nodes, e->getID());
return new Quad(nodes);
}
......
......@@ -50,9 +50,9 @@ const Element* PyramidRule13::getFace(const Element* e, unsigned i)
nodes[j] = const_cast<Node*>(e->getNode(face_nodes[i][j]));
if (i < 4)
return new Tri6(nodes);
return new Tri6(nodes, e->getID());
return new Quad8(nodes);
return new Quad8(nodes, e->getID());
}
ERR("Error in MeshLib::Element::getFace() - Index %d does not exist.", i);
return nullptr;
......
......@@ -52,9 +52,9 @@ const Element* PyramidRule5::getFace(const Element* e, unsigned i)
nodes[j] = const_cast<Node*>(e->getNode(face_nodes[i][j]));
if (i < 4)
return new Tri(nodes);
return new Tri(nodes, e->getID());
return new Quad(nodes);
return new Quad(nodes, e->getID());
}
ERR("Error in MeshLib::Element::getFace() - Index %d does not exist.", i);
return nullptr;
......
......@@ -44,7 +44,7 @@ const Element* TetRule10::getFace(const Element* e, unsigned i)
std::array<Node*,6> nodes;
for (unsigned j=0; j<6; j++)
nodes[j] = const_cast<Node*>(e->getNode(face_nodes[i][j]));
return new Tri6(nodes);
return new Tri6(nodes, e->getID());
}
ERR("Error in MeshLib::Element::getFace() - Index %d does not exist.", i);
return nullptr;
......
......@@ -46,7 +46,7 @@ const Element* TetRule4::getFace(const Element* e, unsigned i)
std::array<Node*,3> nodes;
for (unsigned j=0; j<3; j++)
nodes[j] = const_cast<Node*>(e->getNode(face_nodes[i][j]));
return new Tri(nodes);
return new Tri(nodes, e->getID());
}
ERR("Error in MeshLib::Element::getFace() - Index %d does not exist.", i);
return nullptr;
......
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