From: alberto sartori Date: Wed, 9 Dec 2015 17:29:17 +0000 (+0100) Subject: instantiated for dim,spacedim X-Git-Tag: v8.4.0-rc2~167^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1967%2Fhead;p=dealii.git instantiated for dim,spacedim --- diff --git a/include/deal.II/distributed/solution_transfer.h b/include/deal.II/distributed/solution_transfer.h index c87db10408..9f97a1f8a7 100644 --- a/include/deal.II/distributed/solution_transfer.h +++ b/include/deal.II/distributed/solution_transfer.h @@ -219,8 +219,8 @@ namespace parallel * objects that can later be retrieved after refinement, coarsening and * repartitioning. */ - void pack_callback(const typename Triangulation::cell_iterator &cell, - const typename Triangulation::CellStatus status, + void pack_callback(const typename Triangulation::cell_iterator &cell, + const typename Triangulation::CellStatus status, void *data); /** @@ -228,8 +228,8 @@ namespace parallel * has been packed up previously on the mesh before refinement, * coarsening and repartitioning. */ - void unpack_callback(const typename Triangulation::cell_iterator &cell, - const typename Triangulation::CellStatus status, + void unpack_callback(const typename Triangulation::cell_iterator &cell, + const typename Triangulation::CellStatus status, const void *data, std::vector &all_out); diff --git a/source/distributed/solution_transfer.cc b/source/distributed/solution_transfer.cc index 89dcdbefe9..1f77407c80 100644 --- a/source/distributed/solution_transfer.cc +++ b/source/distributed/solution_transfer.cc @@ -79,9 +79,9 @@ namespace parallel Assert(size > 0, ExcMessage("Please transfer at least one vector!")); //TODO: casting away constness is bad - parallel::distributed::Triangulation *tria - = (dynamic_cast*> - (const_cast*> + parallel::distributed::Triangulation *tria + = (dynamic_cast*> + (const_cast*> (&dof_handler->get_tria()))); Assert (tria != 0, ExcInternalError()); @@ -160,9 +160,9 @@ namespace parallel ExcDimensionMismatch(input_vectors.size(), all_out.size()) ); //TODO: casting away constness is bad - parallel::distributed::Triangulation *tria - = (dynamic_cast*> - (const_cast*> + parallel::distributed::Triangulation *tria + = (dynamic_cast*> + (const_cast*> (&dof_handler->get_tria()))); Assert (tria != 0, ExcInternalError()); @@ -207,8 +207,8 @@ namespace parallel template void SolutionTransfer:: - pack_callback(const typename Triangulation::cell_iterator &cell_, - const typename Triangulation::CellStatus /*status*/, + pack_callback(const typename Triangulation::cell_iterator &cell_, + const typename Triangulation::CellStatus /*status*/, void *data) { typename VectorType::value_type *data_store = reinterpret_cast(data); @@ -232,8 +232,8 @@ namespace parallel template void SolutionTransfer::unpack_callback - (const typename Triangulation::cell_iterator &cell_, - const typename Triangulation::CellStatus /*status*/, + (const typename Triangulation::cell_iterator &cell_, + const typename Triangulation::CellStatus /*status*/, const void *data, std::vector &all_out) { diff --git a/source/distributed/solution_transfer.inst.in b/source/distributed/solution_transfer.inst.in index fe49a1a1e8..fdb83f5bca 100644 --- a/source/distributed/solution_transfer.inst.in +++ b/source/distributed/solution_transfer.inst.in @@ -15,38 +15,41 @@ -for (deal_II_dimension : DIMENSIONS) +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { namespace parallel \{ namespace distributed \{ #if deal_II_dimension > 1 - template class SolutionTransfer, DoFHandler >; - template class SolutionTransfer, DoFHandler >; - template class SolutionTransfer, DoFHandler >; - template class SolutionTransfer, DoFHandler >; - template class SolutionTransfer, DoFHandler >; +#if deal_II_dimension <= deal_II_space_dimension + template class SolutionTransfer, DoFHandler >; + template class SolutionTransfer, DoFHandler >; + template class SolutionTransfer, DoFHandler >; + template class SolutionTransfer, DoFHandler >; + template class SolutionTransfer, DoFHandler >; #ifdef DEAL_II_WITH_PETSC - template class SolutionTransfer >; + template class SolutionTransfer >; - template class SolutionTransfer >; + template class SolutionTransfer >; - template class SolutionTransfer >; + template class SolutionTransfer >; - template class SolutionTransfer >; + template class SolutionTransfer >; #endif #ifdef DEAL_II_WITH_TRILINOS - template class SolutionTransfer >; + template class SolutionTransfer >; - template class SolutionTransfer >; + template class SolutionTransfer >; - template class SolutionTransfer >; + template class SolutionTransfer >; - template class SolutionTransfer >; + template class SolutionTransfer >; +#endif + #endif #endif \}