From: kainan.wang Date: Mon, 4 Feb 2013 07:58:51 +0000 (+0000) Subject: changes @include/deal.II/matrix_free/dof_info.h X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=404f9ae2e12f6afc50e8304b4970d1085a63b14f;p=dealii-svn.git changes @include/deal.II/matrix_free/dof_info.h git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@28218 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/matrix_free/dof_info.h b/deal.II/include/deal.II/matrix_free/dof_info.h index da6d5f9c1b..8e678a0697 100644 --- a/deal.II/include/deal.II/matrix_free/dof_info.h +++ b/deal.II/include/deal.II/matrix_free/dof_info.h @@ -70,13 +70,13 @@ namespace internal * Returns a pointer to the first index in the * DoF row @p row. */ - const unsigned int *begin_indices (const unsigned int row) const; + const types::global_dof_index *begin_indices (const unsigned int row) const; /** * Returns a pointer to the one past the last * DoF index in the row @p row. */ - const unsigned int *end_indices (const unsigned int row) const; + const types::global_dof_index *end_indices (const unsigned int row) const; /** * Returns the number of entries in the @@ -111,7 +111,7 @@ namespace internal * entries where constraints are not * embedded). */ - const unsigned int *begin_indices_plain (const unsigned int row) const; + const types::global_dof_index *begin_indices_plain (const unsigned int row) const; /** * Returns a pointer to the one past the last @@ -119,7 +119,7 @@ namespace internal * entries where constraints are not * embedded). */ - const unsigned int *end_indices_plain (const unsigned int row) const; + const types::global_dof_index *end_indices_plain (const unsigned int row) const; /** * Returns the FE index for a given finite @@ -311,7 +311,7 @@ namespace internal * Renumbers the degrees of freedom to give * good access for this class. */ - void renumber_dofs (std::vector &renumbering); + void renumber_dofs (std::vector &renumbering); /** * Returns the memory consumption in bytes of @@ -355,8 +355,8 @@ namespace internal * not all vector components are filled. */ std::vector > row_starts; + unsigned int, + unsigned int> > row_starts; /** * Stores the (global) indices of the degrees of @@ -369,7 +369,7 @@ namespace internal * contiguous memory region and store the * rowstart in the variable @p row_starts. */ - std::vector dof_indices; + std::vector dof_indices; /** * This variable describes the position of @@ -403,15 +403,15 @@ namespace internal * owned degrees of freedom that are * constrained. */ - std::vector constrained_dofs; + std::vector constrained_dofs; /** * Stores the rowstart indices of the * compressed row storage in the @p - * dof_indices_plain + * plain_dof_indices * fields. */ - std::vector row_starts_plain_indices; + std::vector row_starts_plain_indices; /** * Stores the indices of the degrees of @@ -424,7 +424,7 @@ namespace internal * memory region and store the rowstart in the * variable @p row_starts_plain_indices. */ - std::vector plain_dof_indices; + std::vector plain_dof_indices; /** * Stores the number of components in the @@ -478,7 +478,7 @@ namespace internal * assign_ghosts. Then, all information is * collected by the partitioner. */ - std::vector ghost_dofs; + std::vector ghost_dofs; }; @@ -487,7 +487,7 @@ namespace internal #ifndef DOXYGEN inline - const unsigned int * + const types::global_dof_index * DoFInfo::begin_indices (const unsigned int row) const { AssertIndexRange (row, row_starts.size()-1); @@ -499,7 +499,7 @@ namespace internal inline - const unsigned int * + const types::global_dof_index * DoFInfo::end_indices (const unsigned int row) const { AssertIndexRange (row, row_starts.size()-1);