From: Matthias Maier Date: Mon, 30 Sep 2013 23:29:03 +0000 (+0000) Subject: GridTools::collect_periodic_faces: Port back to "const int" for the direction X-Git-Tag: v8.1.0~570^2~143 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf341bf316a3c9f74529f329979e5a06c920d506;p=dealii.git GridTools::collect_periodic_faces: Port back to "const int" for the direction It is way too painful to workaround the compiler warnings a "const unsigned int" produces git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31050 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/grid/grid_tools.h b/deal.II/include/deal.II/grid/grid_tools.h index 5731c540da..ac6080e565 100644 --- a/deal.II/include/deal.II/grid/grid_tools.h +++ b/deal.II/include/deal.II/grid/grid_tools.h @@ -1050,7 +1050,7 @@ namespace GridTools orthogonal_equality (std::bitset<3> &orientation, const FaceIterator &face1, const FaceIterator &face2, - const unsigned int direction, + const int direction, const dealii::Tensor<1,FaceIterator::AccessorType::space_dimension> &offset); @@ -1061,7 +1061,7 @@ namespace GridTools bool orthogonal_equality (const FaceIterator &face1, const FaceIterator &face2, - const unsigned int direction, + const int direction, const dealii::Tensor<1,FaceIterator::AccessorType::space_dimension> &offset); @@ -1102,7 +1102,7 @@ namespace GridTools (const DH &dof_handler, const types::boundary_id b_id1, const types::boundary_id b_id2, - const unsigned int direction, + const int direction, const dealii::Tensor<1,DH::space_dimension> &offset); @@ -1131,7 +1131,7 @@ namespace GridTools collect_periodic_faces (const DH &dof_handler, const types::boundary_id b_id, - const unsigned int direction, + const int direction, const dealii::Tensor<1,DH::space_dimension> &offset); diff --git a/deal.II/source/grid/grid_tools.cc b/deal.II/source/grid/grid_tools.cc index 8561198444..9f1be35677 100644 --- a/deal.II/source/grid/grid_tools.cc +++ b/deal.II/source/grid/grid_tools.cc @@ -2199,10 +2199,10 @@ next_cell: template inline bool orthogonal_equality (const dealii::Point &point1, const dealii::Point &point2, - const unsigned int direction, + const int direction, const dealii::Tensor<1,spacedim> &offset) { - Assert (direction &orientation, const FaceIterator &face1, const FaceIterator &face2, - const unsigned int direction, + const int direction, const dealii::Tensor<1,FaceIterator::AccessorType::space_dimension> &offset) { static const int dim = FaceIterator::AccessorType::dimension; @@ -2343,7 +2343,7 @@ next_cell: inline bool orthogonal_equality (const FaceIterator &face1, const FaceIterator &face2, - const unsigned int direction, + const int direction, const dealii::Tensor<1,FaceIterator::AccessorType::space_dimension> &offset) { // Call the function above with a dummy orientation array @@ -2361,11 +2361,11 @@ next_cell: match_periodic_face_pairs (std::set > &pairs1, std::set::type, unsigned int> > &pairs2, - const unsigned int direction, + const int direction, const dealii::Tensor<1,CellIterator::AccessorType::space_dimension> &offset) { static const int space_dim = CellIterator::AccessorType::space_dimension; - Assert (direction &offset) { static const unsigned int dim = DH::dimension; static const unsigned int space_dim = DH::space_dimension; - Assert (direction > collect_periodic_faces (const DH &dof_handler, const types::boundary_id b_id, - const unsigned int direction, + const int direction, const dealii::Tensor<1,DH::space_dimension> &offset) { static const unsigned int dim = DH::dimension; static const unsigned int space_dim = DH::space_dimension; - Assert (direction (std::bitset<3> &, const X::active_face_iterator&, const X::active_face_iterator&, - const unsigned int, + const int, const Tensor<1,deal_II_space_dimension> &); template bool orthogonal_equality (std::bitset<3> &, const X::face_iterator&, const X::face_iterator&, - const unsigned int, + const int, const Tensor<1,deal_II_space_dimension> &); template bool orthogonal_equality (const X::active_face_iterator&, const X::active_face_iterator&, - const unsigned int, + const int, const Tensor<1,deal_II_space_dimension> &); template bool orthogonal_equality (const X::face_iterator&, const X::face_iterator&, - const unsigned int, + const int, const Tensor<1,deal_II_space_dimension> &); #if deal_II_dimension >= 2 @@ -257,7 +257,7 @@ for (X : TRIANGULATION_AND_DOFHANDLERS; deal_II_dimension : DIMENSIONS ; deal_II (const X &, const types::boundary_id, const types::boundary_id, - const unsigned int, + const int, const Tensor<1,X::space_dimension> &); template @@ -265,7 +265,7 @@ for (X : TRIANGULATION_AND_DOFHANDLERS; deal_II_dimension : DIMENSIONS ; deal_II collect_periodic_faces (const X &, const types::boundary_id, - const unsigned int, + const int, const Tensor<1,X::space_dimension> &); #endif