From 04ee6a88edbe720f315f20ce5e0b0173b512b506 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 28 May 2002 07:46:34 +0000 Subject: [PATCH] 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 --- deal.II/deal.II/source/grid/grid_reordering.cc | 12 ++++++------ deal.II/deal.II/source/grid/tria_boundary_lib.cc | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc index 7091a5a5e4..3b9abab561 100644 --- 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::Cell::check_consistency (const unsigned int rot) const { const FaceData &face = faces[rot][face_no]->second; - for (unsigned int face_rot=0; face_rotrotational_states_of_faces-1; ++face_rot) + for (unsigned int face_rot=0; face_rotsecond; if (reverse_face.use_count != 0) @@ -736,14 +736,14 @@ void GridReordering::track_back (typename std::vector &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::try_rotate_single_neighbors (typename std::vectorrotational_states_of_cells; ++neighbor_rot) + neighbor_rot::try_rotate_single_neighbors (typename std::vectorrotational_states_of_cells; ++cell_rot) + for (unsigned int cell_rot=0; cell_rot::find_reordering (typename std::vector // 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 aaf6091e46..676f6b1cb1 100644 --- 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::line_iterator &line) c // to the plane part of the // boundary const Point 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::get_new_point_on_line (line); @@ -529,7 +529,7 @@ HalfHyperBallBoundary:: get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const { const Point 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::get_new_point_on_quad (quad); @@ -548,7 +548,7 @@ get_intermediate_points_on_line (const typename Triangulation::line_iterato // to the plane part of the // boundary const Point line_center = line->center(); - if (this->line_this->center(0) == center(0)) + if (line_center(0) == this->center(0)) return StraightBoundary::get_intermediate_points_on_line (line, points); else return HyperBallBoundary::get_intermediate_points_on_line (line, points); @@ -567,7 +567,7 @@ get_intermediate_points_on_quad (const typename Triangulation::quad_iterato // to the plane part of the // boundary const Point quad_center = quad->center(); - if (this->quad_this->center(0) == center(0)) + if (quad_center(0) == this->center(0)) StraightBoundary::get_intermediate_points_on_quad (quad, points); else HyperBallBoundary::get_intermediate_points_on_quad (quad, points); @@ -614,7 +614,7 @@ get_normals_at_vertices (const typename Triangulation::face_iterator &face, // to the plane part of the // boundary const Point quad_center = face->center(); - if (this->quad_this->center(0) == center(0)) + if (quad_center(0) == this->center(0)) StraightBoundary::get_normals_at_vertices (face, face_vertex_normals); else HyperBallBoundary::get_normals_at_vertices (face, face_vertex_normals); -- 2.39.5