Skip to content
Snippets Groups Projects
Commit 398b3f29 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Fixed read pyramid node ordering storage

The wrong ordering was due to a bad triangular faces orientations
... also fixed
parent 9ed28691
No related branches found
No related tags found
1 merge request!124Add files for high order integration with quadratures
...@@ -142,8 +142,10 @@ ConnectivityBuilderBase::_computeCellFaceAndFaceNodeConnectivities(ConnectivityD ...@@ -142,8 +142,10 @@ ConnectivityBuilderBase::_computeCellFaceAndFaceNodeConnectivities(ConnectivityD
} }
case CellType::Pyramid: { case CellType::Pyramid: {
cell_nb_faces[j] = cell_nodes.size(); cell_nb_faces[j] = cell_nodes.size();
std::vector<unsigned int> base_nodes; std::vector<unsigned int> base_nodes(cell_nodes.size() - 1);
std::copy_n(cell_nodes.begin(), cell_nodes.size() - 1, std::back_inserter(base_nodes)); for (size_t i = 0; i < base_nodes.size(); ++i) {
base_nodes[base_nodes.size() - 1 - i] = cell_nodes[i];
}
// base face // base face
{ {
......
...@@ -1235,7 +1235,7 @@ GmshReader::__proceedData() ...@@ -1235,7 +1235,7 @@ GmshReader::__proceedData()
throw NormalError("reading file '" + m_filename + "': error reading element " + std::to_string(i) + throw NormalError("reading file '" + m_filename + "': error reading element " + std::to_string(i) +
" [bad vertices definition]"); " [bad vertices definition]");
} }
m_mesh_data.__pyramids[pyramid_number] = GmshData::Pyramid(d, c, b, a, e); m_mesh_data.__pyramids[pyramid_number] = GmshData::Pyramid(a, b, c, d, e);
m_mesh_data.__pyramids_ref[pyramid_number] = m_mesh_data.__references[i]; m_mesh_data.__pyramids_ref[pyramid_number] = m_mesh_data.__references[i];
m_mesh_data.__pyramids_number[pyramid_number] = m_mesh_data.__elementNumber[i]; m_mesh_data.__pyramids_number[pyramid_number] = m_mesh_data.__elementNumber[i];
pyramid_number++; // one more hexahedron pyramid_number++; // one more hexahedron
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment