fixed several problems related to the recent merge from trunk

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

diff --git a/deal.II/source/dofs/dof_accessor_get.inst.in b/deal.II/source/dofs/dof_accessor_get.inst.in
index e7edf4b712a5db7aed2c44840f49a8bc1a601d7c..5246c6f419ace47572d3bc2e2f313ee24a6cd589 100644 (file)
--- a/deal.II/source/dofs/dof_accessor_get.inst.in
+++ b/deal.II/source/dofs/dof_accessor_get.inst.in
@@ -16,7 +16,7 @@
 
 
 
-for (VEC : SERIAL_VECTORS; SCALAR : REAL_SCALARS; deal_II_dimension : DIMENSIONS; lda : BOOL)
+for (VEC : REAL_SERIAL_VECTORS; SCALAR : REAL_SCALARS; deal_II_dimension : DIMENSIONS; lda : BOOL)
   {
     template
       void
@@ -47,7 +47,7 @@ for (VEC : SERIAL_VECTORS; SCALAR : REAL_SCALARS; deal_II_dimension : DIMENSIONS
   }
 
 
-for (VEC : SERIAL_VECTORS; SCALAR : REAL_SCALARS; deal_II_dimension : DIMENSIONS; lda : BOOL)
+for (VEC : REAL_SERIAL_VECTORS; SCALAR : REAL_SCALARS; deal_II_dimension : DIMENSIONS; lda : BOOL)
   {
     template
       void
@@ -84,44 +84,52 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL)
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
 #if deal_II_dimension != 3
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
 #endif
 
@@ -130,22 +138,26 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL)
     template
       void
       DoFCellAccessor<DoFHandler<1,3>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<1,3>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<1,3>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<1,3>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
 #endif
 
@@ -157,44 +169,52 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL)
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
 #if deal_II_dimension != 3
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
 #endif
 
@@ -203,22 +223,26 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL)
     template
       void
       DoFCellAccessor<hp::DoFHandler<1,3>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<1,3>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::BlockVector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<1,3>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<1,3>, lda>::get_interpolated_dof_values
-      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&) const;
+      (const PETScWrappers::MPI::Vector&, Vector<std::complex<double> >&,
+       const unsigned int fe_index) const;
 
 #endif
 #endif //  PETSC_USE_COMPLEX

diff --git a/deal.II/source/dofs/dof_accessor_set.inst.in b/deal.II/source/dofs/dof_accessor_set.inst.in
index e7c06319894397616298376aa9358ef5f6de8b59..47972d278f86912f3563745ff1b796ffb90be699 100644 (file)
--- a/deal.II/source/dofs/dof_accessor_set.inst.in
+++ b/deal.II/source/dofs/dof_accessor_set.inst.in
@@ -80,44 +80,52 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL)
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::Vector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&,
+       const unsigned int fe_index) const;
 
 #if deal_II_dimension != 3
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::Vector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&,
+       const unsigned int fe_index) const;
 
 #endif
 
@@ -126,22 +134,26 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL)
     template
       void
       DoFCellAccessor<DoFHandler<1,3>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<1,3>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<1,3>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::Vector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<DoFHandler<1,3>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&,
+       const unsigned int fe_index) const;
 
 #endif
 
@@ -152,44 +164,52 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL)
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::Vector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&,
+       const unsigned int fe_index) const;
 
 #if deal_II_dimension != 3
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::Vector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<deal_II_dimension,deal_II_dimension+1>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&,
+       const unsigned int fe_index) const;
 
 #endif
 
@@ -198,22 +218,26 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL)
     template
       void
       DoFCellAccessor<hp::DoFHandler<1,3>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<1,3>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::BlockVector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<1,3>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::Vector&,
+       const unsigned int fe_index) const;
 
     template
       void
       DoFCellAccessor<hp::DoFHandler<1,3>, lda>::set_dof_values_by_interpolation
-      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&) const;
+      (const Vector<std::complex<double> >&, PETScWrappers::MPI::Vector&,
+       const unsigned int fe_index) const;
 
 #endif
 #endif //  PETSC_USE_COMPLEX

diff --git a/deal.II/source/fe/fe_values.cc b/deal.II/source/fe/fe_values.cc
index f565011ec80c00d27aa9b85315d325abad5797e6..199ab74254c8ed912a539470ded38a5b2a8b89b6 100644 (file)
--- a/deal.II/source/fe/fe_values.cc
+++ b/deal.II/source/fe/fe_values.cc
@@ -1000,7 +1000,7 @@ namespace FEValuesViews
     template <int dim, int spacedim>
     void
     do_function_values (const ::dealii::Vector<double> &dof_values,
-                        const Table<2,double>          &shape_values,
+                        const dealii::Table<2,double>          &shape_values,
                         const std::vector<typename SymmetricTensor<2,dim,spacedim>::ShapeFunctionData> &shape_function_data,
                         std::vector<dealii::SymmetricTensor<2,spacedim> > &values)
     {
@@ -1142,7 +1142,7 @@ namespace FEValuesViews
     template <int dim, int spacedim>
     void
     do_function_values (const ::dealii::Vector<double> &dof_values,
-                        const Table<2,double>          &shape_values,
+                        const dealii::Table<2,double>          &shape_values,
                         const std::vector<typename Tensor<2,dim,spacedim>::ShapeFunctionData> &shape_function_data,
                         std::vector<dealii::Tensor<2,spacedim> > &values)
     {
@@ -2201,7 +2201,7 @@ namespace internal
   template <typename Number, typename Number2>
   void
   do_function_values (const Number2         *dof_values_ptr,
-                      const Table<2,double> &shape_values,
+                      const dealii::Table<2,double> &shape_values,
                       std::vector<Number>   &values)
   {
     // scalar finite elements, so shape_values.size() == dofs_per_cell
@@ -2235,7 +2235,7 @@ namespace internal
   template <int dim, int spacedim, typename VectorType, typename Number>
   void
   do_function_values (const Number                      *dof_values_ptr,
-                      const Table<2,double>             &shape_values,
+                      const dealii::Table<2,double>             &shape_values,
                       const FiniteElement<dim,spacedim> &fe,
                       const std::vector<unsigned int> &shape_function_to_row_table,
                       VectorSlice<std::vector<VectorType> > &values,