From: Timo Heister Date: Mon, 25 Mar 2013 14:21:11 +0000 (+0000) Subject: fix some of the multigrid 64 bit indexing X-Git-Tag: v8.0.0~316^2~102 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f5e7ae55c34c2ff2588669b1c0ff199d0c26c3e;p=dealii.git fix some of the multigrid 64 bit indexing git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29025 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/dofs/dof_handler_policy.cc b/deal.II/source/dofs/dof_handler_policy.cc index e4ec539241..7155778e9a 100644 --- a/deal.II/source/dofs/dof_handler_policy.cc +++ b/deal.II/source/dofs/dof_handler_policy.cc @@ -1316,7 +1316,7 @@ namespace internal const typename dealii::internal::p4est::types::quadrant &p4est_cell, const typename DoFHandler::level_cell_iterator &dealii_cell, const typename dealii::internal::p4est::types::quadrant &quadrant, - unsigned int *dofs, + dealii::types::global_dof_index* dofs, unsigned int level) { if (internal::p4est::quadrant_is_equal(p4est_cell, quadrant)) @@ -1570,8 +1570,11 @@ namespace internal typename dealii::internal::p4est::types::quadrant *quadrant =reinterpret_cast::quadrant *>(ptr); ptr+=cells*sizeof(typename dealii::internal::p4est::types::quadrant); - dealii::types::global_dof_index *dofs=reinterpret_cast(ptr); + dealii::types::global_dof_index *dofs + = reinterpret_cast(ptr); + // the dofs pointer contains for each cell the number of dofs + // on that cell (dofs[0]) followed by the dof indices itself. for (unsigned int c=0; c::level_cell_iterator @@ -1809,8 +1812,11 @@ namespace internal typename dealii::internal::p4est::types::quadrant *quadrant =reinterpret_cast::quadrant *>(ptr); ptr+=cells*sizeof(typename dealii::internal::p4est::types::quadrant); - unsigned int *dofs=reinterpret_cast(ptr); + dealii::types::global_dof_index *dofs + = reinterpret_cast(ptr); + // the dofs pointer contains for each cell the number of dofs + // on that cell (dofs[0]) followed by the dof indices itself. for (unsigned int c=0; c::level_cell_iterator