From 5cae92a3f723f21cfe3f824a31694a616d8e1de4 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Wed, 21 Oct 2015 10:52:12 -0400 Subject: [PATCH] 64bit compatiblity --- source/multigrid/mg_transfer_prebuilt.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/multigrid/mg_transfer_prebuilt.cc b/source/multigrid/mg_transfer_prebuilt.cc index e2d5a8dc96..45ad2c84d2 100644 --- a/source/multigrid/mg_transfer_prebuilt.cc +++ b/source/multigrid/mg_transfer_prebuilt.cc @@ -288,10 +288,12 @@ void MGTransferPrebuilt::build_matrices ( struct dof_pair { unsigned int level; - unsigned int global_dof_index; - unsigned int level_dof_index; + types::global_dof_index global_dof_index; + types::global_dof_index level_dof_index; - dof_pair(unsigned int level, unsigned int global_dof_index, unsigned int level_dof_index) + dof_pair(unsigned int level, + types::global_dof_index global_dof_index, + types::global_dof_index level_dof_index) : level(level), global_dof_index(global_dof_index), level_dof_index(level_dof_index) {} @@ -344,7 +346,7 @@ void MGTransferPrebuilt::build_matrices ( if (mg_constrained_dofs != 0 && mg_constrained_dofs->at_refinement_edge(level, level_dof_indices[i])) continue; - unsigned int global_idx = globally_relevant.index_within_set(global_dof_indices[i]); + types::global_dof_index global_idx = globally_relevant.index_within_set(global_dof_indices[i]); //skip if we did this global dof already (on this or a coarser level) if (dof_touched[global_idx]) continue; @@ -445,7 +447,7 @@ void MGTransferPrebuilt::build_matrices ( for (unsigned int i=0; i (receive[i].global_dof_index, receive[i].level_dof_index) + std::make_pair (receive[i].global_dof_index, receive[i].level_dof_index) ); } } -- 2.39.5