From: David Wells Date: Fri, 16 Apr 2021 15:41:15 +0000 (-0400) Subject: Remove the rest of the create_triangulation_compatibility calls. X-Git-Tag: v9.3.0-rc1~216^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22c58eaf1570e6d6f44a32c63636b3614e688bdc;p=dealii.git Remove the rest of the create_triangulation_compatibility calls. --- diff --git a/source/grid/grid_in.cc b/source/grid/grid_in.cc index fde2b74b14..520a04d493 100644 --- a/source/grid/grid_in.cc +++ b/source/grid/grid_in.cc @@ -574,15 +574,11 @@ GridIn::read_vtk(std::istream &in) GridReordering::reorder_cells(cells, true); tria->create_triangulation(vertices, cells, subcelldata); - - return; } else { // simplex or mixed mesh - tria->create_triangulation_compatibility(vertices, - cells, - subcelldata); + tria->create_triangulation(vertices, cells, subcelldata); } } else @@ -2744,8 +2740,8 @@ GridIn<2>::read_tecplot(std::istream &in) { cells[cell].vertices[0] = i + j * I; cells[cell].vertices[1] = i + 1 + j * I; - cells[cell].vertices[2] = i + 1 + (j + 1) * I; - cells[cell].vertices[3] = i + (j + 1) * I; + cells[cell].vertices[2] = i + (j + 1) * I; + cells[cell].vertices[3] = i + 1 + (j + 1) * I; ++cell; } Assert(cell == n_cells, ExcInternalError()); @@ -2792,8 +2788,8 @@ GridIn<2>::read_tecplot(std::istream &in) // get the connectivity from the // input file. the vertices are // ordered like in the ucd format - for (unsigned int &vertex : cells[i].vertices) - in >> vertex; + for (const unsigned int j : GeometryInfo::vertex_indices()) + in >> cells[i].vertices[GeometryInfo::ucd_to_deal[j]]; } // do some clean-up on vertices GridTools::delete_unused_vertices(vertices, cells, subcelldata); @@ -2807,9 +2803,10 @@ GridIn<2>::read_tecplot(std::istream &in) // do some cleanup on cells GridReordering::invert_all_cells_of_negative_grid(vertices, - cells); - GridReordering::reorder_cells(cells); - tria->create_triangulation_compatibility(vertices, cells, subcelldata); + cells, + true); + GridReordering::reorder_cells(cells, true); + tria->create_triangulation(vertices, cells, subcelldata); } @@ -2914,7 +2911,8 @@ GridIn::read_assimp(const std::string &filename, { for (const unsigned int f : GeometryInfo::vertex_indices()) { - cells[valid_cell].vertices[f] = + cells[valid_cell] + .vertices[GeometryInfo::ucd_to_deal[f]] = mFaces[i].mIndices[f] + v_offset; } cells[valid_cell].material_id = m; @@ -2962,13 +2960,11 @@ GridIn::read_assimp(const std::string &filename, GridTools::delete_unused_vertices(vertices, cells, subcelldata); if (dim == spacedim) GridReordering::invert_all_cells_of_negative_grid(vertices, - cells); + cells, + true); + GridReordering::reorder_cells(cells, true); + tria->create_triangulation(vertices, cells, subcelldata); - GridReordering::reorder_cells(cells); - if (dim == 2) - tria->create_triangulation_compatibility(vertices, cells, subcelldata); - else - tria->create_triangulation(vertices, cells, subcelldata); #else (void)filename; (void)mesh_index;