From: young <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 26 Mar 2014 13:40:34 +0000 (+0000)
Subject: Inst. interpolate function for REAL_SERIAL_VECTOR. Add TODO.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=599081ed2bbdb884fa88fc9f50396a94e5f8fb00;p=dealii-svn.git

Inst. interpolate function for REAL_SERIAL_VECTOR. Add TODO.

git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32698 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/include/deal.II/numerics/vector_tools.templates.h b/deal.II/include/deal.II/numerics/vector_tools.templates.h
index e6c9e9ed3d..e41bd1be6e 100644
--- a/deal.II/include/deal.II/numerics/vector_tools.templates.h
+++ b/deal.II/include/deal.II/numerics/vector_tools.templates.h
@@ -280,17 +280,20 @@ namespace VectorTools
 
 
 
-
+  // @whattodo TODO: To return functionality for complex numbers, this
+  // needs to be templated with Number and instantiated for
+  // REAL_SERIAL_VECTORS+double and
+  // COMPLEX_SERIAL_VECTORS+complex<double>
   template <int dim, class InVector, class OutVector, int spacedim>
   void
   interpolate (const DoFHandler<dim,spacedim>  &dof_1,
                const DoFHandler<dim,spacedim>  &dof_2,
-               const FullMatrix<double>        &transfer,
+               const FullMatrix<double>        &transfer, // <- FullMatrix<std::complex>
                const InVector                  &data_1,
                OutVector                       &data_2)
   {
     Vector<double> cell_data_1(dof_1.get_fe().dofs_per_cell); // <- Vector<std::complex>
-    Vector<double> cell_data_2(dof_2.get_fe().dofs_per_cell);
+    Vector<double> cell_data_2(dof_2.get_fe().dofs_per_cell); // <- Vector<std::complex>
 
     std::vector<short unsigned int> touch_count (dof_2.n_dofs(), 0); //TODO: check on datatype... kinda strange (UK)
     std::vector<types::global_dof_index>       local_dof_indices (dof_2.get_fe().dofs_per_cell);
@@ -301,13 +304,7 @@ namespace VectorTools
 
     for (; h != endh; ++h, ++l)
       {
-	// @whattodo Some of the problems in petsc_vector_base.h are
-	// instantiated here. Should look into DoFCellAccessor too. It
-	// looks like *maybe* vector_tools needs to be templated (run
-	// grep -R "double" on that file). Additionally, *this* file
-	// needs to be templated with "number".
-	/* h->get_dof_values(data_1, cell_data_1);  */
-	Assert ((false), ExcMessage ("This function is corrupt: @whattodo"));
+	h->get_dof_values(data_1, cell_data_1);  
 
         transfer.vmult(cell_data_2, cell_data_1);
 
@@ -318,8 +315,7 @@ namespace VectorTools
           {
             data_2(local_dof_indices[j]) += cell_data_2(j);
 
-            // count, how often we have
-            // added to this dof
+            // count, how often we have added to this dof
             Assert (touch_count[local_dof_indices[j]] < numbers::internal_face_boundary_id,
                     ExcInternalError());
             ++touch_count[local_dof_indices[j]];
diff --git a/deal.II/source/numerics/vector_tools_interpolate.inst.in b/deal.II/source/numerics/vector_tools_interpolate.inst.in
index a21c69a76b..9b46645411 100644
--- a/deal.II/source/numerics/vector_tools_interpolate.inst.in
+++ b/deal.II/source/numerics/vector_tools_interpolate.inst.in
@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------
 
 
-for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
+for (VEC : REAL_SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     namespace VectorTools \{