From: young <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 25 Mar 2014 14:07:33 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deb38b2e265f5403c8c150baf127fa15fb25bd5d;p=dealii-svn.git

Merge from mainline.

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

deb38b2e265f5403c8c150baf127fa15fb25bd5d
diff --cc deal.II/include/deal.II/numerics/vector_tools.h
index 9558de7a42,59c74cfccc..8705ce67b5
--- a/deal.II/include/deal.II/numerics/vector_tools.h
+++ b/deal.II/include/deal.II/numerics/vector_tools.h
@@@ -498,7 -498,7 +498,7 @@@ namespace VectorTool
    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, 
                      const InVector           &data_1,
                      OutVector                &data_2);
  
diff --cc deal.II/include/deal.II/numerics/vector_tools.templates.h
index 10fcba7a3f,cef2e584ce..e6c9e9ed3d
--- a/deal.II/include/deal.II/numerics/vector_tools.templates.h
+++ b/deal.II/include/deal.II/numerics/vector_tools.templates.h
@@@ -300,10 -301,7 +301,14 @@@ namespace VectorTool
  
      for (; h != endh; ++h, ++l)
        {
- 	// @whattodo Some of the problems in petsc_vector_base.h are instantiated here.
- 	/* h->get_dof_values(data_1, cell_data_1); // <- complaint line 655 */
 -        h->get_dof_values(data_1, cell_data_1);
++	// @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"));
 +
          transfer.vmult(cell_data_2, cell_data_1);
  
          l->get_dof_indices (local_dof_indices);