Merge from mainline.

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

diff --cc deal.II/include/deal.II/algorithms/operator.templates.h
Simple merge

diff --cc deal.II/include/deal.II/numerics/vector_tools.h
index 9558de7a4283858e904b4c0936310b48cb655647,59c74cfccc4e4d268139b4971de935298e2ad28f..8705ce67b5d59b0e1540cd8e8016d5fb6863595f
--- 1/deal.II/include/deal.II/numerics/vector_tools.h
--- 2/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 10fcba7a3f478e7e38806cf076ce2ee430dc19af,cef2e584ce61ae297f7d5b754619f7eee3a748e6..e6c9e9ed3d771e514642981bb6f56c577f83e8d0
--- 1/deal.II/include/deal.II/numerics/vector_tools.templates.h
--- 2/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);