From a4471df3c462a85cb5fe2ed4542306f1b656ac19 Mon Sep 17 00:00:00 2001 From: "denis.davydov" Date: Wed, 5 Mar 2014 15:52:25 +0000 Subject: [PATCH] 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 --- deal.II/source/dofs/dof_accessor_get.inst.in | 76 +++++++++++++------- deal.II/source/dofs/dof_accessor_set.inst.in | 72 ++++++++++++------- deal.II/source/fe/fe_values.cc | 8 +-- 3 files changed, 102 insertions(+), 54 deletions(-) diff --git a/deal.II/source/dofs/dof_accessor_get.inst.in b/deal.II/source/dofs/dof_accessor_get.inst.in index e7edf4b712..5246c6f419 100644 --- 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, lda>::get_interpolated_dof_values - (const PETScWrappers::BlockVector&, Vector >&) const; + (const PETScWrappers::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::BlockVector&, Vector >&) const; + (const PETScWrappers::MPI::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::Vector&, Vector >&) const; + (const PETScWrappers::Vector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::Vector&, Vector >&) const; + (const PETScWrappers::MPI::Vector&, Vector >&, + const unsigned int fe_index) const; #if deal_II_dimension != 3 template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::BlockVector&, Vector >&) const; + (const PETScWrappers::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::BlockVector&, Vector >&) const; + (const PETScWrappers::MPI::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::Vector&, Vector >&) const; + (const PETScWrappers::Vector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::Vector&, Vector >&) const; + (const PETScWrappers::MPI::Vector&, Vector >&, + const unsigned int fe_index) const; #endif @@ -130,22 +138,26 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL) template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::BlockVector&, Vector >&) const; + (const PETScWrappers::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::BlockVector&, Vector >&) const; + (const PETScWrappers::MPI::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::Vector&, Vector >&) const; + (const PETScWrappers::Vector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::Vector&, Vector >&) const; + (const PETScWrappers::MPI::Vector&, Vector >&, + const unsigned int fe_index) const; #endif @@ -157,44 +169,52 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL) template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::BlockVector&, Vector >&) const; + (const PETScWrappers::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::BlockVector&, Vector >&) const; + (const PETScWrappers::MPI::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::Vector&, Vector >&) const; + (const PETScWrappers::Vector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::Vector&, Vector >&) const; + (const PETScWrappers::MPI::Vector&, Vector >&, + const unsigned int fe_index) const; #if deal_II_dimension != 3 template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::BlockVector&, Vector >&) const; + (const PETScWrappers::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::BlockVector&, Vector >&) const; + (const PETScWrappers::MPI::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::Vector&, Vector >&) const; + (const PETScWrappers::Vector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::Vector&, Vector >&) const; + (const PETScWrappers::MPI::Vector&, Vector >&, + const unsigned int fe_index) const; #endif @@ -203,22 +223,26 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL) template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::BlockVector&, Vector >&) const; + (const PETScWrappers::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::BlockVector&, Vector >&) const; + (const PETScWrappers::MPI::BlockVector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::Vector&, Vector >&) const; + (const PETScWrappers::Vector&, Vector >&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::get_interpolated_dof_values - (const PETScWrappers::MPI::Vector&, Vector >&) const; + (const PETScWrappers::MPI::Vector&, Vector >&, + 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 e7c0631989..47972d278f 100644 --- 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, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::BlockVector&) const; + (const Vector >&, PETScWrappers::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::BlockVector&) const; + (const Vector >&, PETScWrappers::MPI::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::Vector&) const; + (const Vector >&, PETScWrappers::Vector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::Vector&) const; + (const Vector >&, PETScWrappers::MPI::Vector&, + const unsigned int fe_index) const; #if deal_II_dimension != 3 template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::BlockVector&) const; + (const Vector >&, PETScWrappers::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::BlockVector&) const; + (const Vector >&, PETScWrappers::MPI::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::Vector&) const; + (const Vector >&, PETScWrappers::Vector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::Vector&) const; + (const Vector >&, PETScWrappers::MPI::Vector&, + const unsigned int fe_index) const; #endif @@ -126,22 +134,26 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL) template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::BlockVector&) const; + (const Vector >&, PETScWrappers::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::BlockVector&) const; + (const Vector >&, PETScWrappers::MPI::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::Vector&) const; + (const Vector >&, PETScWrappers::Vector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::Vector&) const; + (const Vector >&, PETScWrappers::MPI::Vector&, + const unsigned int fe_index) const; #endif @@ -152,44 +164,52 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL) template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::BlockVector&) const; + (const Vector >&, PETScWrappers::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::BlockVector&) const; + (const Vector >&, PETScWrappers::MPI::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::Vector&) const; + (const Vector >&, PETScWrappers::Vector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::Vector&) const; + (const Vector >&, PETScWrappers::MPI::Vector&, + const unsigned int fe_index) const; #if deal_II_dimension != 3 template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::BlockVector&) const; + (const Vector >&, PETScWrappers::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::BlockVector&) const; + (const Vector >&, PETScWrappers::MPI::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::Vector&) const; + (const Vector >&, PETScWrappers::Vector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::Vector&) const; + (const Vector >&, PETScWrappers::MPI::Vector&, + const unsigned int fe_index) const; #endif @@ -198,22 +218,26 @@ for (deal_II_dimension : DIMENSIONS; lda : BOOL) template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::BlockVector&) const; + (const Vector >&, PETScWrappers::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::BlockVector&) const; + (const Vector >&, PETScWrappers::MPI::BlockVector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::Vector&) const; + (const Vector >&, PETScWrappers::Vector&, + const unsigned int fe_index) const; template void DoFCellAccessor, lda>::set_dof_values_by_interpolation - (const Vector >&, PETScWrappers::MPI::Vector&) const; + (const Vector >&, 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 f565011ec8..199ab74254 100644 --- a/deal.II/source/fe/fe_values.cc +++ b/deal.II/source/fe/fe_values.cc @@ -1000,7 +1000,7 @@ namespace FEValuesViews template void do_function_values (const ::dealii::Vector &dof_values, - const Table<2,double> &shape_values, + const dealii::Table<2,double> &shape_values, const std::vector::ShapeFunctionData> &shape_function_data, std::vector > &values) { @@ -1142,7 +1142,7 @@ namespace FEValuesViews template void do_function_values (const ::dealii::Vector &dof_values, - const Table<2,double> &shape_values, + const dealii::Table<2,double> &shape_values, const std::vector::ShapeFunctionData> &shape_function_data, std::vector > &values) { @@ -2201,7 +2201,7 @@ namespace internal template void do_function_values (const Number2 *dof_values_ptr, - const Table<2,double> &shape_values, + const dealii::Table<2,double> &shape_values, std::vector &values) { // scalar finite elements, so shape_values.size() == dofs_per_cell @@ -2235,7 +2235,7 @@ namespace internal template void do_function_values (const Number *dof_values_ptr, - const Table<2,double> &shape_values, + const dealii::Table<2,double> &shape_values, const FiniteElement &fe, const std::vector &shape_function_to_row_table, VectorSlice > &values, -- 2.39.5