From: Wolfgang Bangerth Date: Fri, 12 Jun 2009 09:01:42 +0000 (+0000) Subject: Take over patch 18932 from the 6-2 branch: Work around a problem with gcc3.3.1 and... X-Git-Tag: v8.0.0~7615 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00937810d2402900dbfc35528ce93deca3bcc696;p=dealii.git Take over patch 18932 from the 6-2 branch: Work around a problem with gcc3.3.1 and clean up a piece of code. git-svn-id: https://svn.dealii.org/trunk@18934 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/grid/grid_refinement.cc b/deal.II/deal.II/source/grid/grid_refinement.cc index ba33ff56a1..c96a80f034 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -503,28 +503,32 @@ GridRefinement::refine_and_coarsen_optimize (Triangulation &tria, template void GridRefinement:: -refine (Triangulation &, +refine,deal_II_dimension> + (Triangulation &, const Vector &, const double); template void GridRefinement:: -refine (Triangulation &, +refine,deal_II_dimension> + (Triangulation &, const Vector &, const double); template void GridRefinement:: -coarsen (Triangulation &, +coarsen,deal_II_dimension> + (Triangulation &, const Vector &, const double); template void GridRefinement:: -coarsen (Triangulation &, +coarsen,deal_II_dimension> + (Triangulation &, const Vector &, const double); @@ -532,93 +536,149 @@ coarsen (Triangulation &, template void GridRefinement:: -refine_and_coarsen_fixed_number (Triangulation &, - const Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_number,deal_II_dimension> +(Triangulation &, + const Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_number (Triangulation &, - const Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_number,deal_II_dimension> + (Triangulation &, + const Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_fraction (Triangulation &, - const Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_fraction,deal_II_dimension> + (Triangulation &, + const Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_fraction (Triangulation &, - const Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_fraction,deal_II_dimension> + (Triangulation &, + const Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_optimize (Triangulation &, - const Vector &); +refine_and_coarsen_optimize,deal_II_dimension> +(Triangulation &, + const Vector &); template void GridRefinement:: -refine_and_coarsen_optimize (Triangulation &, - const Vector &); +refine_and_coarsen_optimize,deal_II_dimension> +(Triangulation &, + const Vector &); #ifdef DEAL_II_USE_PETSC template void GridRefinement:: -refine (Triangulation &, - const PETScWrappers::Vector &, - const double); +refine + (Triangulation &, + const PETScWrappers::Vector &, + const double); template void GridRefinement:: -coarsen (Triangulation &, - const PETScWrappers::Vector &, - const double); +coarsen +(Triangulation &, + const PETScWrappers::Vector &, + const double); template void GridRefinement:: -refine_and_coarsen_fixed_number (Triangulation &, - const PETScWrappers::Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_number +(Triangulation &, + const PETScWrappers::Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_fraction (Triangulation &, - const PETScWrappers::Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_fraction +(Triangulation &, + const PETScWrappers::Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_optimize (Triangulation &, - const PETScWrappers::Vector &); +refine_and_coarsen_optimize +(Triangulation &, + const PETScWrappers::Vector &); +#endif + +#ifdef DEAL_II_USE_TRILINOS +template +void +GridRefinement:: +refine + (Triangulation &, + const TrilinosWrappers::Vector &, + const double); + +template +void +GridRefinement:: +coarsen +(Triangulation &, + const TrilinosWrappers::Vector &, + const double); + + +template +void +GridRefinement:: +refine_and_coarsen_fixed_number +(Triangulation &, + const TrilinosWrappers::Vector &, + const double, + const double, + const unsigned int); + +template +void +GridRefinement:: +refine_and_coarsen_fixed_fraction +(Triangulation &, + const TrilinosWrappers::Vector &, + const double, + const double, + const unsigned int); + +template +void +GridRefinement:: +refine_and_coarsen_optimize +(Triangulation &, + const TrilinosWrappers::Vector &); #endif -//<<<<<<< .working #if deal_II_dimension != 3 @@ -626,28 +686,32 @@ refine_and_coarsen_optimize (Triangulation &, template void GridRefinement:: -refine (Triangulation &, +refine,deal_II_dimension+1> + (Triangulation &, const Vector &, const double); template void GridRefinement:: -refine (Triangulation &, +refine,deal_II_dimension+1> + (Triangulation &, const Vector &, const double); template void GridRefinement:: -coarsen (Triangulation &, +coarsen,deal_II_dimension+1> + (Triangulation &, const Vector &, const double); template void GridRefinement:: -coarsen (Triangulation &, +coarsen,deal_II_dimension+1> + (Triangulation &, const Vector &, const double); @@ -655,135 +719,150 @@ coarsen (Triangulation &, template void GridRefinement:: -refine_and_coarsen_fixed_number (Triangulation &, - const Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_number,deal_II_dimension+1> +(Triangulation &, + const Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_number (Triangulation &, - const Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_number,deal_II_dimension+1> + (Triangulation &, + const Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_fraction (Triangulation &, - const Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_fraction,deal_II_dimension+1> + (Triangulation &, + const Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_fraction (Triangulation &, - const Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_fraction,deal_II_dimension+1> + (Triangulation &, + const Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_optimize (Triangulation &, - const Vector &); +refine_and_coarsen_optimize,deal_II_dimension+1> +(Triangulation &, + const Vector &); template void GridRefinement:: -refine_and_coarsen_optimize (Triangulation &, - const Vector &); +refine_and_coarsen_optimize,deal_II_dimension+1> +(Triangulation &, + const Vector &); #ifdef DEAL_II_USE_PETSC template void GridRefinement:: -refine (Triangulation &, - const PETScWrappers::Vector &, - const double); +refine + (Triangulation &, + const PETScWrappers::Vector &, + const double); template void GridRefinement:: -coarsen (Triangulation &, - const PETScWrappers::Vector &, - const double); +coarsen +(Triangulation &, + const PETScWrappers::Vector &, + const double); template void GridRefinement:: -refine_and_coarsen_fixed_number (Triangulation &, - const PETScWrappers::Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_number +(Triangulation &, + const PETScWrappers::Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_fraction (Triangulation &, - const PETScWrappers::Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_fraction +(Triangulation &, + const PETScWrappers::Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_optimize (Triangulation &, - const PETScWrappers::Vector &); +refine_and_coarsen_optimize +(Triangulation &, + const PETScWrappers::Vector &); #endif -#endif - -//======= - #ifdef DEAL_II_USE_TRILINOS template void GridRefinement:: -refine (Triangulation &, - const TrilinosWrappers::Vector &, - const double); +refine + (Triangulation &, + const TrilinosWrappers::Vector &, + const double); template void GridRefinement:: -coarsen (Triangulation &, - const TrilinosWrappers::Vector &, - const double); +coarsen +(Triangulation &, + const TrilinosWrappers::Vector &, + const double); template void GridRefinement:: -refine_and_coarsen_fixed_number (Triangulation &, - const TrilinosWrappers::Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_number +(Triangulation &, + const TrilinosWrappers::Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_fixed_fraction (Triangulation &, - const TrilinosWrappers::Vector &, - const double, - const double, - const unsigned int); +refine_and_coarsen_fixed_fraction +(Triangulation &, + const TrilinosWrappers::Vector &, + const double, + const double, + const unsigned int); template void GridRefinement:: -refine_and_coarsen_optimize (Triangulation &, - const TrilinosWrappers::Vector &); +refine_and_coarsen_optimize +(Triangulation &, + const TrilinosWrappers::Vector &); +#endif + + #endif DEAL_II_NAMESPACE_CLOSE