From be8c4c03847a5e3e1175f133ad31bd53b9619c08 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 20 Sep 2013 23:00:53 +0000 Subject: [PATCH] Add an instantiation that was previous missing in optimized mode. git-svn-id: https://svn.dealii.org/trunk@30877 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/news/changes.h | 13 +++++++-- deal.II/source/grid/grid_tools.inst.in | 39 ++++++++++++++++++-------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 870ca7974c..cf9bc2661d 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -63,8 +63,8 @@ inconvenience this causes.
  • - New: parallel::distributed::Triangulation now supports periodic boundaries. - DoFTools::make_periodicity_constraints and similar functions are now working + New: parallel::distributed::Triangulation now supports periodic boundaries. + DoFTools::make_periodicity_constraints and similar functions are now working on parallel::distributed::Triangulation objects.
    (Tobin Isaac, Craig Michoski, Daniel Arndt, 2013/09/06) @@ -85,9 +85,16 @@ inconvenience this causes.

    Specific improvements

      +
    1. + Changed: GridTools::have_same_coarse_mesh was only instantiated for + MGDoFHandler arguments in debug mode. This is now fixed. +
      + (Timo Heister, 2013/09/20) +
    2. - Changed: find_active_cell_around_point now throws the exception ExcPointNotFound + Changed: GridTools::find_active_cell_around_point now throws the exception + GridTools::ExcPointNotFound if the point is outside the Triangulation. This exception can be caught.
      (Timo Heister, 2013/09/18) diff --git a/deal.II/source/grid/grid_tools.inst.in b/deal.II/source/grid/grid_tools.inst.in index 465931c953..55d2ad3972 100644 --- a/deal.II/source/grid/grid_tools.inst.in +++ b/deal.II/source/grid/grid_tools.inst.in @@ -28,7 +28,7 @@ for (deal_II_dimension : DIMENSIONS) for (X : TRIANGULATION_AND_DOFHANDLERS; deal_II_dimension : DIMENSIONS ; deal_II_space_dimension : SPACE_DIMENSIONS) { - + #if deal_II_dimension <= deal_II_space_dimension namespace GridTools \{ @@ -69,6 +69,23 @@ for (X : TRIANGULATION_AND_DOFHANDLERS; deal_II_dimension : DIMENSIONS ; deal_II } + +for (deal_II_dimension : DIMENSIONS ; deal_II_space_dimension : SPACE_DIMENSIONS) +{ + +#if deal_II_dimension <= deal_II_space_dimension + namespace GridTools \{ + template + bool + have_same_coarse_mesh (const MGDoFHandler &mesh_1, + const MGDoFHandler &mesh_2); + + \} + + #endif +} + + for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension @@ -84,7 +101,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS volume (const Triangulation &, const Mapping &); - + template void delete_unused_vertices (std::vector > &, std::vector > &, @@ -119,7 +136,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS template void partition_triangulation (const unsigned int, Triangulation &); - + template void partition_triangulation (const unsigned int, const SparsityPattern &, @@ -132,9 +149,9 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS (const hp::MappingCollection &, const hp::DoFHandler &, const Point &); - - + + template void get_subdomain_association (const Triangulation &, std::vector &); @@ -143,11 +160,11 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS unsigned int count_cells_with_subdomain_association( const Triangulation &, const types::subdomain_id); - + template double minimal_cell_diameter (const Triangulation &triangulation); - + template double maximal_cell_diameter (const Triangulation &triangulation); @@ -158,7 +175,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS const Triangulation &triangulation_1, const Triangulation &triangulation_2, Triangulation &result); -#if deal_II_dimension == deal_II_space_dimension +#if deal_II_dimension == deal_II_space_dimension template void laplace_transform (const std::map > &new_points, @@ -171,12 +188,12 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS Triangulation &triangulation); #endif - + \} #endif - + } @@ -317,7 +334,7 @@ for (deal_II_dimension : DIMENSIONS ; deal_II_space_dimension : SPACE_DIMENSIONS const unsigned int, std::vector::cell_iterator, unsigned int, - parallel::distributed::Triangulation::cell_iterator, + parallel::distributed::Triangulation::cell_iterator, unsigned int> > &); \} #endif -- 2.39.5