From c93d0d561f2215e99cd2409b17c3d73f696a3fba Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Mon, 10 Feb 2014 15:48:26 +0000 Subject: [PATCH] Replaced all tria.get_boundary(OBJ-\>boundary_id) with OBJ-\>get_boundary() git-svn-id: https://svn.dealii.org/branches/branch_manifold_id_intermediate@32448 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/grid/tria.cc | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc index a3701f8c80..ac23fb319f 100644 --- a/deal.II/source/grid/tria.cc +++ b/deal.II/source/grid/tria.cc @@ -4055,8 +4055,7 @@ namespace internal // stored in the // boundary class triangulation.vertices[next_unused_vertex] = - triangulation.get_boundary(static_cast(cell->material_id())) - .get_new_point_on_quad (cell); + cell->get_boundary().get_new_point_on_quad(cell); } } @@ -4447,8 +4446,7 @@ namespace internal (cell->vertex(0) + cell->vertex(1)) / 2; else triangulation.vertices[next_unused_vertex] = - triangulation.get_boundary(static_cast(cell->material_id())) - .get_new_point_on_line(cell); + cell->get_boundary().get_new_point_on_line(cell); triangulation.vertices_used[next_unused_vertex] = true; // search for next two @@ -4869,8 +4867,7 @@ namespace internal // the two vertices: if (line->at_boundary()) triangulation.vertices[next_unused_vertex] - = triangulation.get_boundary(line->boundary_indicator()) - .get_new_point_on_line (line); + = line->get_boundary().get_new_point_on_line (line); else triangulation.vertices[next_unused_vertex] = (line->vertex(0) + line->vertex(1)) / 2; @@ -5413,12 +5410,8 @@ namespace internal ExcTooFewVerticesAllocated()); triangulation.vertices_used[next_unused_vertex] = true; - if (line->at_boundary()) - triangulation.vertices[next_unused_vertex] - = triangulation.get_boundary(line->boundary_indicator()).get_new_point_on_line (line); - else - triangulation.vertices[next_unused_vertex] - = (line->vertex(0) + line->vertex(1)) / 2; + triangulation.vertices[next_unused_vertex] + = line->get_boundary().get_new_point_on_line (line); // now that we created // the right point, make @@ -6089,7 +6082,7 @@ namespace internal // appropriately if (quad->at_boundary()) triangulation.vertices[next_unused_vertex] - = triangulation.get_boundary(quad->boundary_indicator()).get_new_point_on_quad (quad); + = quad->get_boundary().get_new_point_on_quad (quad); else // it might be that the // quad itself is not @@ -9110,8 +9103,7 @@ namespace internal // boundary would be // this one. const Point new_bound - = triangulation.get_boundary(face->boundary_indicator()) - .get_new_point_on_face (face); + = face->get_boundary().get_new_point_on_face (face); // to check it, // transform to the // unit cell with -- 2.39.5