From aab8263c2e0e2c7f09468cb5e43288c71569be3b Mon Sep 17 00:00:00 2001 From: young Date: Thu, 27 Mar 2014 09:39:38 +0000 Subject: [PATCH] Correct instantiation of MappingQ1Euler. git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32701 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/mapping_q1_eulerian.cc | 5 +---- deal.II/source/fe/mapping_q1_eulerian.inst.in | 6 ++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/deal.II/source/fe/mapping_q1_eulerian.cc b/deal.II/source/fe/mapping_q1_eulerian.cc index 49fd4d7517..8a9d8b3a43 100644 --- a/deal.II/source/fe/mapping_q1_eulerian.cc +++ b/deal.II/source/fe/mapping_q1_eulerian.cc @@ -78,10 +78,7 @@ compute_mapping_support_points(const typename Triangulation::cell_ // now get the values of the shift // vectors at the vertices Vector mapping_values (shiftmap_dof_handler->get_fe().dofs_per_cell); - - // @whattodo Some of the problems in petsc_vector_base.h are instantiated here. - // dof_cell->get_dof_values (*euler_transform_vectors, mapping_values); <- complaint line - Assert ((false), ExcMessage ("This function is corrupt: @whattodo")); + dof_cell->get_dof_values (*euler_transform_vectors, mapping_values); for (unsigned int i=0; i::vertices_per_cell; ++i) { diff --git a/deal.II/source/fe/mapping_q1_eulerian.inst.in b/deal.II/source/fe/mapping_q1_eulerian.inst.in index 06d1ebc290..c1b2e4a467 100644 --- a/deal.II/source/fe/mapping_q1_eulerian.inst.in +++ b/deal.II/source/fe/mapping_q1_eulerian.inst.in @@ -15,14 +15,16 @@ // --------------------------------------------------------------------- - -for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) +// TODO[TY]: allow this to be instantiated by PETScWrappers::Vector and PETSC_WITH_COMPLEX +for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS) { #if deal_II_dimension <= deal_II_space_dimension template class MappingQ1Eulerian, deal_II_space_dimension>; template class MappingQ1Eulerian, deal_II_space_dimension>; #ifdef DEAL_II_WITH_PETSC +#ifdef PETSC_WITH_COMPLEX template class MappingQ1Eulerian; #endif +#endif #endif } -- 2.39.5