From 6e0e2ee52afc574ee1c3870f110d1b5b5569f390 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sat, 9 Feb 2013 05:15:53 +0000 Subject: [PATCH] Make a few things compile. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28294 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/dofs/dof_accessor.templates.h | 16 ++++++++-------- deal.II/include/deal.II/dofs/dof_handler.h | 2 -- deal.II/include/deal.II/hp/dof_handler.h | 10 +++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h index 6bf22668e1..6e836a3204 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -2681,7 +2681,7 @@ namespace internal dofs_per_line = accessor.get_fe().dofs_per_line, dofs_per_cell = accessor.get_fe().dofs_per_cell; - Assert (dof_indices.size() == dofs_per_cell, + Assert (local_dof_indices.size() == dofs_per_cell, ExcInternalError()); unsigned int index = 0; @@ -2689,9 +2689,9 @@ namespace internal for (unsigned int vertex=0; vertex<2; ++vertex) for (unsigned int d=0; dset_dof_index(accessor.dof_handler->get_fe(). adjust_line_dof_index_for_line_orientation(d, accessor.line_orientation(line)), - dof_indices[index]); + local_dof_indices[index]); // now copy dof numbers into the face. for // faces with the wrong orientation, we // have already made sure that we're ok by @@ -2796,9 +2796,9 @@ namespace internal accessor.face_orientation(quad), accessor.face_flip(quad), accessor.face_rotation(quad)), - dof_indices[index]); + local_dof_indices[index]); for (unsigned int d=0; d &fe); - virtual void distribute_mg_dofs (const FiniteElement &fe, const types::global_dof_index offset = 0); - /** * Distribute multigrid degrees of freedom similar * to distribute_dofs() but on each level. diff --git a/deal.II/include/deal.II/hp/dof_handler.h b/deal.II/include/deal.II/hp/dof_handler.h index 008159b391..f4136f5c43 100644 --- a/deal.II/include/deal.II/hp/dof_handler.h +++ b/deal.II/include/deal.II/hp/dof_handler.h @@ -378,7 +378,7 @@ namespace hp * DoFs which are constrained by * hanging nodes, see @ref constraints. */ - types::global_dof_index n_dofs () const; + types::global_dof_index n_dofs () const; /** * The number of multilevel @@ -389,7 +389,7 @@ namespace hp * numbers::invalid_unsigned * int independent of its argument. */ - types::global_dof_index int n_dofs(const unsigned int level) const; + types::global_dof_index n_dofs(const unsigned int level) const; /** * Return the number of degrees of freedom @@ -912,7 +912,7 @@ namespace hp template inline - unsigned int + types::global_dof_index DoFHandler::n_dofs (const unsigned int) const { return numbers::invalid_unsigned_int; @@ -920,7 +920,7 @@ namespace hp template - unsigned int + types::global_dof_index DoFHandler::n_locally_owned_dofs() const { return number_cache.n_locally_owned_dofs; @@ -936,7 +936,7 @@ namespace hp template - const std::vector & + const std::vector & DoFHandler::n_locally_owned_dofs_per_processor() const { return number_cache.n_locally_owned_dofs_per_processor; -- 2.39.5