From 2e4597a2f2cd888159ea7afd3b7f872becd28c1a Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 15 Aug 2008 23:48:08 +0000 Subject: [PATCH] Fix a few cases that I accidentally got wrong. git-svn-id: https://svn.dealii.org/trunk@16570 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/grid/tria.cc | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index f5fb222c3a..be172c1553 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -7425,13 +7425,13 @@ Triangulation<3>::execute_refinement () const raw_line_iterator lines_x[4] = { hex->face(2)->child(0) - ->line((hex->face(2)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //0 + ->line((hex->face(2)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //0 hex->face(3)->child(0) - ->line((hex->face(3)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //1 + ->line((hex->face(3)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //1 hex->face(4)->child(0) - ->line((hex->face(4)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //2 + ->line((hex->face(4)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //2 hex->face(5)->child(0) - ->line((hex->face(5)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3) //3 + ->line((hex->face(5)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3) //3 }; lines=&lines_x[0]; @@ -7637,13 +7637,13 @@ Triangulation<3>::execute_refinement () const raw_line_iterator lines_y[4] = { hex->face(0)->child(0) - ->line((hex->face(0)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //0 + ->line((hex->face(0)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //0 hex->face(1)->child(0) - ->line((hex->face(1)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //1 + ->line((hex->face(1)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //1 hex->face(4)->child(0) - ->line((hex->face(4)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //2 + ->line((hex->face(4)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //2 hex->face(5)->child(0) - ->line((hex->face(5)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3) //3 + ->line((hex->face(5)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3) //3 }; lines=&lines_y[0]; @@ -7850,13 +7850,13 @@ Triangulation<3>::execute_refinement () const raw_line_iterator lines_z[4] = { hex->face(0)->child(0) - ->line((hex->face(0)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //0 + ->line((hex->face(0)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //0 hex->face(1)->child(0) - ->line((hex->face(1)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //1 + ->line((hex->face(1)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //1 hex->face(2)->child(0) - ->line((hex->face(2)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //2 + ->line((hex->face(2)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //2 hex->face(3)->child(0) - ->line((hex->face(3)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3) //3 + ->line((hex->face(3)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3) //3 }; lines=&lines_z[0]; @@ -8088,13 +8088,13 @@ Triangulation<3>::execute_refinement () const raw_line_iterator lines_xy[13] = { hex->face(0)->child(0) - ->line((hex->face(0)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //0 + ->line((hex->face(0)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //0 hex->face(1)->child(0) - ->line((hex->face(1)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //1 + ->line((hex->face(1)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //1 hex->face(2)->child(0) - ->line((hex->face(2)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //2 + ->line((hex->face(2)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //2 hex->face(3)->child(0) - ->line((hex->face(3)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //3 + ->line((hex->face(3)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //3 hex->face(4)->isotropic_child(GeometryInfo::standard_to_real_face_vertex(0,f_or[4],f_fl[4],f_ro[4])) ->line(GeometryInfo::standard_to_real_face_line(1,f_or[4],f_fl[4],f_ro[4])), //4 @@ -8443,13 +8443,13 @@ Triangulation<3>::execute_refinement () const raw_line_iterator lines_xz[13] = { hex->face(0)->child(0) - ->line((hex->face(0)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //0 + ->line((hex->face(0)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //0 hex->face(1)->child(0) - ->line((hex->face(1)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //1 + ->line((hex->face(1)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //1 hex->face(4)->child(0) - ->line((hex->face(4)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //2 + ->line((hex->face(4)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //2 hex->face(5)->child(0) - ->line((hex->face(5)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //3 + ->line((hex->face(5)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //3 hex->face(2)->isotropic_child(GeometryInfo::standard_to_real_face_vertex(0,f_or[2],f_fl[2],f_ro[2])) ->line(GeometryInfo::standard_to_real_face_line(3,f_or[2],f_fl[2],f_ro[2])), //4 @@ -8815,13 +8815,13 @@ Triangulation<3>::execute_refinement () const raw_line_iterator lines_yz[13] = { hex->face(2)->child(0) - ->line((hex->face(2)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //0 + ->line((hex->face(2)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //0 hex->face(3)->child(0) - ->line((hex->face(3)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //1 + ->line((hex->face(3)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //1 hex->face(4)->child(0) - ->line((hex->face(4)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //2 + ->line((hex->face(4)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //2 hex->face(5)->child(0) - ->line((hex->face(5)->refinement_case() == RefinementCase<1>::cut_x) ? 1 : 3), //3 + ->line((hex->face(5)->refinement_case() == RefinementCase<2>::cut_x) ? 1 : 3), //3 hex->face(0)->isotropic_child(GeometryInfo::standard_to_real_face_vertex(0,f_or[0],f_fl[0],f_ro[0])) ->line(GeometryInfo::standard_to_real_face_line(1,f_or[0],f_fl[0],f_ro[0])), //4 -- 2.39.5