changes@ include/deal.II/matrix_free/dof_info.template.h

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@28224 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/matrix_free/dof_info.templates.h b/deal.II/include/deal.II/matrix_free/dof_info.templates.h
index 58284f6ee3395279c8c9a8fcb78a89124a316912..a7702500d1e90c98993a724cb2a2a318843a1bda 100644 (file)
--- a/deal.II/include/deal.II/matrix_free/dof_info.templates.h
+++ b/deal.II/include/deal.II/matrix_free/dof_info.templates.h
@@ -26,8 +26,8 @@ namespace internal
 
     struct ConstraintComparator
     {
-      bool operator()(const std::pair<unsigned int,double> &p1,
-                      const std::pair<unsigned int,double> &p2) const
+      bool operator()(const std::pair<types::global_dof_index,double> &p1,
+                      const std::pair<types::global_dof_index,double> &p2) const
       {
         return p1.second < p2.second;
       }
@@ -59,12 +59,13 @@ namespace internal
        * later on.
        */
       unsigned short
-      insert_entries (const std::vector<std::pair<unsigned int,double> > &entries);
+      insert_entries (const std::vector<std::pair<types::global_dof_index,double> > &entries);
 
-      std::vector<std::pair<unsigned int, double> > constraint_entries;
-      std::vector<unsigned int> constraint_indices;
-      std::pair<std::vector<Number>,unsigned int> next_constraint;
-      std::map<std::vector<Number>,unsigned int,FPArrayComparator<double> > constraints;
+      std::vector<std::pair<types::global_dof_index, double> > constraint_entries;
+      std::vector<types::global_dof_index> constraint_indices;
+
+      std::pair<std::vector<Number>, types::global_dof_index> next_constraint;
+      std::map<std::vector<Number>, types::global_dof_index, FPArrayComparator<double> > constraints;
     };
 
 
@@ -77,7 +78,7 @@ namespace internal
     template <typename Number>
     unsigned short
     ConstraintValues<Number>::
-    insert_entries (const std::vector<std::pair<unsigned int,double> > &entries)
+      insert_entries (const std::vector<std::pair<types::global_dof_index,double> > &entries)
     {
       next_constraint.first.resize(entries.size());
       if (entries.size() > 0)
@@ -180,7 +181,7 @@ namespace internal
 
 
     void
-    DoFInfo::read_dof_indices (const std::vector<unsigned int> &local_indices,
+      DoFInfo::read_dof_indices (const std::vector<types::global_dof_index> &local_indices,
                                const std::vector<unsigned int> &lexicographic_inv,
                                const ConstraintMatrix          &constraints,
                                const unsigned int               cell_number,
@@ -189,8 +190,8 @@ namespace internal
     {
       Assert (vector_partitioner.get() !=0, ExcInternalError());
       const unsigned int n_mpi_procs = vector_partitioner->n_mpi_processes();
-      const unsigned int first_owned = vector_partitioner->local_range().first;
-      const unsigned int last_owned  = vector_partitioner->local_range().second;
+      const types::global_dof_index first_owned = vector_partitioner->local_range().first;
+      const types::global_dof_index last_owned  = vector_partitioner->local_range().second;
       const unsigned int n_owned     = last_owned - first_owned;
       std::pair<unsigned short,unsigned short> constraint_iterator (0,0);
 
@@ -198,7 +199,7 @@ namespace internal
                                     dofs_per_cell[0] : dofs_per_cell[cell_active_fe_index[cell_number]];
       for (unsigned int i=0; i<dofs_this_cell; i++)
         {
-          unsigned int current_dof =
+         types::global_dof_index current_dof =
             local_indices[lexicographic_inv[i]];
           const std::vector<std::pair<unsigned int,double> >
           *entries_ptr =
@@ -1856,7 +1857,7 @@ not_connect:
                     {
                       const unsigned int *it = begin_indices
                                                (renumbering[cell]),
-                                               * end_cell = end_indices (renumbering[cell]);
+                       *end_cell = end_indices (renumbering[cell]);
                       for ( ; it != end_cell; ++it)
                         connectivity_dof.add(*it, block);
                     }