Seems as if my automatic two-stage lookup fixes went too far in some places.

git-svn-id: https://svn.dealii.org/trunk@5894 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc
index 7091a5a5e41fe9954e6dffb8aa7d0cff4be3b191..3b9abab561145438537a2a42317f04324a8ffd50 100644 (file)
--- a/deal.II/deal.II/source/grid/grid_reordering.cc
+++ b/deal.II/deal.II/source/grid/grid_reordering.cc
@@ -619,7 +619,7 @@ bool GridReordering<dim>::Cell::check_consistency (const unsigned int rot) const
     {
       const FaceData &face = faces[rot][face_no]->second;
 
-      for (unsigned int face_rot=0; face_rot<this->rotational_states_of_faces-1; ++face_rot)
+      for (unsigned int face_rot=0; face_rot<rotational_states_of_faces-1; ++face_rot)
        {
          const FaceData &reverse_face = face.reverse_faces[face_rot]->second;
          if (reverse_face.use_count != 0)
@@ -736,14 +736,14 @@ void GridReordering<dim>::track_back (typename std::vector<Cell> &cells,
                                       // stack
       rotation_states.pop_back();
     };
-  Assert (last_rotation_state < this->rotational_states_of_cells, ExcInternalError());
+  Assert (last_rotation_state < rotational_states_of_cells, ExcInternalError());
   
                                   // now we will have to find out
                                   // whether we can try the last cell
                                   // we have popped from the stack in
                                   // another rotation state, or will
                                   // have to backtrack further:
-  if (last_rotation_state < this->rotational_states_of_cells-1)
+  if (last_rotation_state < rotational_states_of_cells-1)
     {
                                       // possible. push that state to
                                       // the stack and leave
@@ -820,7 +820,7 @@ bool GridReordering<dim>::try_rotate_single_neighbors (typename std::vector<Cell
                                           // that have already been
                                           // tried:
          for (unsigned int neighbor_rot=old_rotation_state+1;
-              neighbor_rot<this->rotational_states_of_cells; ++neighbor_rot)
+              neighbor_rot<rotational_states_of_cells; ++neighbor_rot)
            {
                                               // first, if the
                                               // neighbor itself does
@@ -840,7 +840,7 @@ bool GridReordering<dim>::try_rotate_single_neighbors (typename std::vector<Cell
                                               // orientation
              cells[neighbor_no].mark_faces_used (neighbor_rot);
 
-             for (unsigned int cell_rot=0; cell_rot<this->rotational_states_of_cells; ++cell_rot)
+             for (unsigned int cell_rot=0; cell_rot<rotational_states_of_cells; ++cell_rot)
                if (cells[cell_no].check_consistency (cell_rot) == true)
                  {
                                                     // ah, see,
@@ -968,7 +968,7 @@ void GridReordering<dim>::find_reordering (typename std::vector<Cell>
                                           // no, doesn't work. see if
                                           // we can rotate the top
                                           // cell so that it works
-         if (rotation_states.back()+1 < this->rotational_states_of_cells)
+         if (rotation_states.back()+1 < rotational_states_of_cells)
            {
                                               // yes, can be
                                               // done. then do so and

diff --git a/deal.II/deal.II/source/grid/tria_boundary_lib.cc b/deal.II/deal.II/source/grid/tria_boundary_lib.cc
index aaf6091e469a1ca183f707fba082c2d0874b5c94..676f6b1cb1a4e10fea406b6b5ce80544272cf326 100644 (file)
--- a/deal.II/deal.II/source/grid/tria_boundary_lib.cc
+++ b/deal.II/deal.II/source/grid/tria_boundary_lib.cc
@@ -500,7 +500,7 @@ get_new_point_on_line (const typename Triangulation<dim>::line_iterator &line) c
                                   // to the plane part of the
                                   // boundary
   const Point<dim> line_center = line->center();
-  if (this->line_this->center(0) == center(0))
+  if (line_center(0) == this->center(0))
     return line_center;
   else
     return HyperBallBoundary<dim>::get_new_point_on_line (line);
@@ -529,7 +529,7 @@ HalfHyperBallBoundary<dim>::
 get_new_point_on_quad (const typename Triangulation<dim>::quad_iterator &quad) const 
 {
   const Point<dim> quad_center = quad->center();
-  if (this->quad_this->center(0) == center(0))
+  if (quad_center(0) == this->center(0))
     return quad_center;
   else
     return HyperBallBoundary<dim>::get_new_point_on_quad (quad);
@@ -548,7 +548,7 @@ get_intermediate_points_on_line (const typename Triangulation<dim>::line_iterato
                                   // to the plane part of the
                                   // boundary
   const Point<dim> line_center = line->center();
-  if (this->line_this->center(0) == center(0))
+  if (line_center(0) == this->center(0))
     return StraightBoundary<dim>::get_intermediate_points_on_line (line, points);
   else
     return HyperBallBoundary<dim>::get_intermediate_points_on_line (line, points);
@@ -567,7 +567,7 @@ get_intermediate_points_on_quad (const typename Triangulation<dim>::quad_iterato
                                   // to the plane part of the
                                   // boundary
   const Point<dim> quad_center = quad->center();
-  if (this->quad_this->center(0) == center(0))
+  if (quad_center(0) == this->center(0))
     StraightBoundary<dim>::get_intermediate_points_on_quad (quad, points);
   else
     HyperBallBoundary<dim>::get_intermediate_points_on_quad (quad, points);
@@ -614,7 +614,7 @@ get_normals_at_vertices (const typename Triangulation<dim>::face_iterator &face,
                                   // to the plane part of the
                                   // boundary
   const Point<dim> quad_center = face->center();
-  if (this->quad_this->center(0) == center(0))
+  if (quad_center(0) == this->center(0))
     StraightBoundary<dim>::get_normals_at_vertices (face, face_vertex_normals);
   else
     HyperBallBoundary<dim>::get_normals_at_vertices (face, face_vertex_normals);