From: kanschat Date: Fri, 10 Aug 2012 21:34:03 +0000 (+0000) Subject: changed global dof indices X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47a3caa1f4dec38bc9fb806611119d0bbc5af795;p=dealii-svn.git changed global dof indices git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25892 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/fe/fe_values.h b/deal.II/include/deal.II/fe/fe_values.h index fcdf99f5e9..d53a7fa2d7 100644 --- a/deal.II/include/deal.II/fe/fe_values.h +++ b/deal.II/include/deal.II/fe/fe_values.h @@ -2153,7 +2153,7 @@ class FEValuesBase : protected FEValuesData, */ template void get_function_values (const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector& values) const; /** @@ -2196,7 +2196,7 @@ class FEValuesBase : protected FEValuesData, */ template void get_function_values (const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& values) const; @@ -2260,7 +2260,7 @@ class FEValuesBase : protected FEValuesData, */ template void get_function_values (const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, VectorSlice > > values, const bool quadrature_points_fastest) const; @@ -2384,7 +2384,7 @@ class FEValuesBase : protected FEValuesData, */ template void get_function_gradients (const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& gradients) const; /** @@ -2395,7 +2395,7 @@ class FEValuesBase : protected FEValuesData, */ template void get_function_gradients (const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, VectorSlice > > > gradients, bool quadrature_points_fastest = false) const; @@ -2421,7 +2421,7 @@ class FEValuesBase : protected FEValuesData, */ template void get_function_grads (const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& gradients) const; /** @@ -2430,7 +2430,7 @@ class FEValuesBase : protected FEValuesData, */ template void get_function_grads (const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector > >& gradients, bool quadrature_points_fastest = false) const; @@ -2561,7 +2561,7 @@ class FEValuesBase : protected FEValuesData, template void get_function_hessians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& hessians) const; /** @@ -2574,7 +2574,7 @@ class FEValuesBase : protected FEValuesData, template void get_function_hessians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, VectorSlice > > > hessians, bool quadrature_points_fastest = false) const; @@ -2726,7 +2726,7 @@ class FEValuesBase : protected FEValuesData, template void get_function_laplacians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector& laplacians) const; /** @@ -2739,7 +2739,7 @@ class FEValuesBase : protected FEValuesData, template void get_function_laplacians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& laplacians) const; /** @@ -2752,7 +2752,7 @@ class FEValuesBase : protected FEValuesData, template void get_function_laplacians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& laplacians, bool quadrature_points_fastest = false) const; //@} diff --git a/deal.II/source/fe/fe_values.cc b/deal.II/source/fe/fe_values.cc index 36e7552579..b9773449ce 100644 --- a/deal.II/source/fe/fe_values.cc +++ b/deal.II/source/fe/fe_values.cc @@ -1389,7 +1389,7 @@ class FEValuesBase::CellIteratorBase * to. */ virtual - unsigned int + types::global_dof_index n_dofs_for_dof_handler () const = 0; #include "fe_values.decl.1.inst" @@ -1458,7 +1458,7 @@ class FEValuesBase::CellIterator : public FEValuesBase::TriaCellIterator : public FEValuesBase::cell_iterator () const template template -unsigned int +types::global_dof_index FEValuesBase::CellIterator::n_dofs_for_dof_handler () const { return cell->get_dof_handler().n_dofs(); @@ -1641,7 +1641,7 @@ get_interpolated_dof_values (const IndexSet &in, { Assert (cell->has_children() == false, ExcNotImplemented()); - std::vector dof_indices (cell->get_fe().dofs_per_cell); + std::vector dof_indices (cell->get_fe().dofs_per_cell); cell->get_dof_indices (dof_indices); for (unsigned int i=0; iget_fe().dofs_per_cell; ++i) @@ -1682,7 +1682,7 @@ operator typename Triangulation::cell_iterator () const template -unsigned int +types::global_dof_index FEValuesBase::TriaCellIterator::n_dofs_for_dof_handler () const { Assert (false, ExcMessage (message_string)); @@ -1890,7 +1890,7 @@ template template void FEValuesBase::get_function_values ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector &values) const { Assert (this->update_flags & update_values, ExcAccessToUninitializedField()); @@ -2064,7 +2064,7 @@ template template void FEValuesBase::get_function_values ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& values) const { // One value per quadrature point @@ -2156,7 +2156,7 @@ template template void FEValuesBase::get_function_values ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, VectorSlice > > values, bool quadrature_points_fastest) const { @@ -2333,7 +2333,7 @@ template template void FEValuesBase::get_function_gradients ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector > &gradients) const { Assert (this->update_flags & update_gradients, ExcAccessToUninitializedField()); @@ -2472,7 +2472,7 @@ template template void FEValuesBase::get_function_gradients ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, VectorSlice > > > gradients, bool quadrature_points_fastest) const { @@ -2633,7 +2633,7 @@ template template void FEValuesBase::get_function_hessians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector > &hessians) const { Assert (this->update_flags & update_second_derivatives, ExcAccessToUninitializedField()); @@ -2763,7 +2763,7 @@ template template void FEValuesBase::get_function_hessians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, VectorSlice > > > hessians, bool quadrature_points_fastest) const { @@ -2927,7 +2927,7 @@ template template void FEValuesBase::get_function_laplacians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector &laplacians) const { Assert (this->update_flags & update_hessians, ExcAccessToUninitializedField()); @@ -3061,7 +3061,7 @@ template template void FEValuesBase::get_function_laplacians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& laplacians) const { // One value per quadrature point @@ -3155,7 +3155,7 @@ template template void FEValuesBase::get_function_laplacians ( const InputVector& fe_function, - const VectorSlice >& indices, + const VectorSlice >& indices, std::vector >& laplacians, bool quadrature_points_fastest) const {