From: Luca Heltai Date: Sun, 12 Apr 2015 18:11:26 +0000 (+0200) Subject: Merge pull request #784 from luca-heltai/grid-generators-codim-one X-Git-Tag: v8.3.0-rc1~287 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f23a7e3ceeced09f9cbcf04c9dd6bf65ec8c9792;p=dealii.git Merge pull request #784 from luca-heltai/grid-generators-codim-one Make subdivided hyper cube/rectangle work for general Triangulation. --- f23a7e3ceeced09f9cbcf04c9dd6bf65ec8c9792 diff --cc source/grid/grid_generator.cc index 44add74bcd,5dd92b5e48..3c3730a439 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@@ -114,25 -115,25 +115,25 @@@ namespace GridGenerato // should be smaller than the smallest cell // diameter. - typename Triangulation::face_iterator face = tria.begin_face(), - endface = tria.end_face(); + typename Triangulation::face_iterator face = tria.begin_face(), + endface = tria.end_face(); for (; face!=endface; ++face) { - if (face->boundary_indicator() == 0) + if (face->boundary_id() == 0) { - const Point center (face->center()); + const Point center (face->center()); if (std::abs(center(0)-p1[0]) < epsilon) - face->set_boundary_indicator(0); + face->set_boundary_id(0); else if (std::abs(center(0) - p2[0]) < epsilon) - face->set_boundary_indicator(1); + face->set_boundary_id(1); else if (dim > 1 && std::abs(center(1) - p1[1]) < epsilon) - face->set_boundary_indicator(2); + face->set_boundary_id(2); else if (dim > 1 && std::abs(center(1) - p2[1]) < epsilon) - face->set_boundary_indicator(3); + face->set_boundary_id(3); else if (dim > 2 && std::abs(center(2) - p1[2]) < epsilon) - face->set_boundary_indicator(4); + face->set_boundary_id(4); else if (dim > 2 && std::abs(center(2) - p2[2]) < epsilon) - face->set_boundary_indicator(5); + face->set_boundary_id(5); else // triangulation says it // is on the boundary,