From 90dfe27e809668841a34d724857c2938684ec56e Mon Sep 17 00:00:00 2001 From: hartmann Date: Tue, 9 Aug 2005 10:59:36 +0000 Subject: [PATCH] Remove obsolete CellData::rotate function. Previously used in GridReordering the rotate function is not used any more after incorporation of Mike's new 3d reordering algorithm (patch 1.50 of grid_reordering). git-svn-id: https://svn.dealii.org/trunk@11253 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/grid/tria.h | 41 ---------- .../source/grid/tria.all_dimensions.cc | 80 ------------------- 2 files changed, 121 deletions(-) diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index 3559aad265..4e4b5601d0 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -57,43 +57,6 @@ struct CellData * different coefficients, etc. */ unsigned char material_id; - - /** - * Rotate the cell as many times - * as is given by the - * argument. Rotation is done by - * rotating the vertices. Note - * that rotation is not possible - * in 1d, and that there are four - * possible orientations of a - * cell in 2d, which are numbered - * counter-clockwise. In 3d, a - * cell can be rotated in 24 - * ways. - * - * Note that in general the - * result will be different if - * you rotate a cell twice or - * once with the number of times - * added. While this is not true - * in 2d, in 3d rotations are - * neither cumulative nor - * exchangable. - */ - void rotate (const unsigned int times); - - /** - * Rotations are not possible in - * 1d. - */ - DeclException0 (ExcNotPossible); - /** - * Exception - */ - DeclException1 (ExcInvalidRotation, - int, - << "The requested number of rotations, " << arg1 - << " is not possible in the present space dimension."); }; @@ -3514,10 +3477,6 @@ template <> void Triangulation<1>::update_number_cache_quads (); template <> void Triangulation<1>::update_number_cache_hexes (); template <> void Triangulation<2>::update_number_cache_hexes (); -template <> void CellData<1>::rotate (const unsigned int); -template <> void CellData<2>::rotate (const unsigned int times); -template <> void CellData<3>::rotate (const unsigned int times); - /// @endif #endif diff --git a/deal.II/deal.II/source/grid/tria.all_dimensions.cc b/deal.II/deal.II/source/grid/tria.all_dimensions.cc index 05c237f2aa..00d1de515b 100644 --- a/deal.II/deal.II/source/grid/tria.all_dimensions.cc +++ b/deal.II/deal.II/source/grid/tria.all_dimensions.cc @@ -34,86 +34,6 @@ -template <> -void -CellData<1>::rotate (const unsigned int) -{ - Assert (false, ExcNotPossible()); -} - - - -template <> -void -CellData<2>::rotate (const unsigned int times) -{ - Assert (times < 4, ExcInvalidRotation(times)); - - for (unsigned int i=0; i -void -CellData<3>::rotate (const unsigned int times) -{ - Assert (times < 24, ExcInvalidRotation(times)); - - // list the 24 ways to rotate a - // cell, by the ways by which the - // vertices are then permuted - static const unsigned int rotations[24][GeometryInfo<3>::vertices_per_cell] - = { {0,1,2,3,4,5,6,7}, - {1,5,6,2,0,4,7,3}, - {5,4,7,6,1,0,3,2}, - {4,0,3,7,5,1,2,6}, - - {2,3,0,1,6,7,4,5}, - {3,7,4,0,2,6,5,1}, - {7,6,5,4,3,2,1,0}, - {6,2,1,5,7,3,0,4}, - - {0,3,7,4,1,2,6,5}, - {3,2,6,7,0,1,5,4}, - {2,1,5,6,3,0,4,7}, - {1,0,4,5,2,3,7,6}, - - {1,2,3,0,5,6,7,4}, - {2,6,7,3,1,5,4,0}, - {6,5,4,7,2,1,0,3}, - {5,1,0,4,6,2,3,7}, - - {5,6,2,1,4,7,3,0}, - {6,7,3,2,5,4,0,1}, - {7,4,0,3,6,5,1,2}, - {4,5,1,0,7,6,2,3}, - - {3,0,1,2,7,4,5,6}, - {0,4,5,1,3,7,6,2}, - {4,7,6,5,0,3,2,1}, - {7,3,2,6,4,0,1,5} }; - - // first copy over the old vertex - // numbers - const unsigned int old_vertices[GeometryInfo<3>::vertices_per_cell] - = { vertices[0], vertices[1], vertices[2], vertices[3], - vertices[4], vertices[5], vertices[6], vertices[7] }; - - // then copy them back in the new - // order - for (unsigned int i=0; i::vertices_per_cell; ++i) - vertices[i] = old_vertices[rotations[times][i]]; -} - - bool SubCellData::check_consistency (const unsigned int dim) const { -- 2.39.5