]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Convert unsigned int to types::global_dof_index in the tests.
authorturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 19 Mar 2013 19:19:14 +0000 (19:19 +0000)
committerturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 19 Mar 2013 19:19:14 +0000 (19:19 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28944 0785d39b-7218-0410-832d-ea1e28bc413d

131 files changed:
deal.II/include/deal.II/dofs/dof_tools.h
deal.II/include/deal.II/matrix_free/fe_evaluation.h
deal.II/source/dofs/dof_tools.cc
deal.II/source/dofs/dof_tools.inst.in
deal.II/source/multigrid/mg_tools.cc
deal.II/source/multigrid/mg_tools.inst.in
tests/base/index_set_19.cc
tests/benchmarks/old/spec2006-447.dealII.cc
tests/benchmarks/step-22/step-22.cc
tests/benchmarks/test_assembly/step-22.cc
tests/benchmarks/test_poisson/poisson.cc
tests/bits/anna_3.cc
tests/bits/anna_4.cc
tests/bits/anna_6.cc
tests/bits/apply_boundary_values_01.cc
tests/bits/apply_boundary_values_02.cc
tests/bits/apply_boundary_values_03.cc
tests/bits/apply_boundary_values_04.cc
tests/bits/joa_1.cc
tests/bits/make_boundary_constraints_01.cc
tests/bits/make_boundary_constraints_02.cc
tests/bits/step-13.cc
tests/bits/step-14.cc
tests/bits/step-15.cc
tests/bits/step-16b.cc
tests/bits/step-3.cc
tests/bits/step-4.cc
tests/bits/step-5.cc
tests/bits/step-6.cc
tests/bits/step-7.cc
tests/bits/step-8.cc
tests/deal.II/block_matrices.cc
tests/deal.II/boundaries.cc
tests/deal.II/constraints_block_01.cc
tests/deal.II/constraints_hanging_nodes_bc.cc
tests/deal.II/constraints_local_to_global.cc
tests/deal.II/constraints_local_to_global_chunk.cc
tests/deal.II/fe_values_view_23.cc
tests/deal.II/fe_values_view_24.cc
tests/deal.II/fe_values_view_25.cc
tests/deal.II/inhomogeneous_constraints.cc
tests/deal.II/inhomogeneous_constraints_04.cc
tests/deal.II/inhomogeneous_constraints_block.cc
tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
tests/deal.II/interpolate_boundary_values_02.cc
tests/deal.II/memory_consumption_01.cc
tests/deal.II/point_value_history_02.cc
tests/deal.II/point_value_history_03.cc
tests/distributed_grids/count_dofs_per_block_01.cc
tests/fail/circular_01.cc
tests/fail/hp-step-14.cc
tests/fail/hp-step-15.cc
tests/fe/abf_01.cc
tests/fe/deformed_projection.h
tests/fe/fe_q_dg0.cc
tests/hp/compare_hp_vs_nonhp_01.cc
tests/hp/count_dofs_per_block_01.cc
tests/hp/count_dofs_per_block_02.cc
tests/hp/crash_07.cc
tests/hp/crash_09.cc
tests/hp/crash_10.cc
tests/hp/crash_11.cc
tests/hp/crash_14.cc
tests/hp/crash_15.cc
tests/hp/crash_17.cc
tests/hp/crash_17_compressed_set_sparsity.cc
tests/hp/crash_18.cc
tests/hp/crash_18_compressed_set_sparsity.cc
tests/hp/crash_19.cc
tests/hp/fe_nothing_07.cc
tests/hp/fe_nothing_12.cc
tests/hp/fe_nothing_13.cc
tests/hp/fe_nothing_14.cc
tests/hp/renumber_block_wise_01b.cc
tests/hp/step-13.cc
tests/hp/step-3.cc
tests/hp/step-3a.cc
tests/hp/step-3b.cc
tests/hp/step-3c.cc
tests/hp/step-4.cc
tests/hp/step-5.cc
tests/hp/step-6.cc
tests/hp/step-7.cc
tests/hp/step-8.cc
tests/integrators/divergence_01.cc
tests/integrators/elasticity_01.cc
tests/integrators/laplacian_01.cc
tests/lac/block_indices.cc
tests/lac/block_matrices.cc
tests/lac/block_sparsity_pattern_01.cc
tests/lac/block_sparsity_pattern_02.cc
tests/lac/block_vector.cc
tests/lac/block_vector_copy.cc
tests/lac/block_vector_iterator.cc
tests/lac/block_vector_vector_assign.cc
tests/lac/complex_block_vector.cc
tests/lac/complex_block_vector_iterator.cc
tests/lac/complex_block_vector_vector_assign.cc
tests/matrix_free/matrix_vector_common.h
tests/matrix_free/matrix_vector_curl.cc
tests/matrix_free/matrix_vector_div.cc
tests/matrix_free/matrix_vector_hp.cc
tests/matrix_free/matrix_vector_mg.cc
tests/matrix_free/matrix_vector_stokes.cc
tests/matrix_free/matrix_vector_stokes_noflux.cc
tests/matrix_free/step-37.cc
tests/mpi/matrix_free_01.cc
tests/mpi/matrix_free_03.cc
tests/mpi/no_flux_constraints.cc
tests/mpi/no_flux_constraints_02.cc
tests/mpi/no_flux_constraints_03.cc
tests/mpi/renumber_z_order_01.cc
tests/mpi/renumber_z_order_02.cc
tests/mpi/step-40.cc
tests/mpi/step-40_direct_solver.cc
tests/multigrid/boundary_01.cc
tests/multigrid/count_01.cc
tests/multigrid/dof_01.cc
tests/multigrid/dof_02.cc
tests/multigrid/mg_output.cc
tests/multigrid/mg_renumbered_01.cc
tests/multigrid/mg_renumbered_02.cc
tests/multigrid/mg_renumbered_03.cc
tests/multigrid/renumbering_01.cc
tests/multigrid/renumbering_03.cc
tests/multigrid/transfer_03.cc
tests/multigrid/transfer_block.cc
tests/multigrid/transfer_block_select.cc
tests/multigrid/transfer_compare_01.cc
tests/multigrid/transfer_select.cc
tests/umfpack/umfpack_04.cc

index 27990c15dc625bdacf238d47c7911eeaeac6318f..1aa12bb3361dec3de6c80d3e7836702b368bc126 100644 (file)
@@ -2259,8 +2259,8 @@ namespace DoFTools
   count_dofs_per_component (const DH      &dof_handler,
                             std::vector<types::global_dof_index> &dofs_per_component,
                             const bool vector_valued_once = false,
-                            std::vector<types::global_dof_index>  target_component
-                            = std::vector<types::global_dof_index>());
+                            std::vector<unsigned int>  target_component
+                            = std::vector<unsigned int>());
 
   /**
    * Count the degrees of freedom
@@ -2312,7 +2312,7 @@ namespace DoFTools
   void
   count_dofs_per_component (const DoFHandler<dim,spacedim>     &dof_handler,
                             std::vector<types::global_dof_index> &dofs_per_component,
-                            std::vector<types::global_dof_index>  target_component) DEAL_II_DEPRECATED;
+                            std::vector<unsigned int>  target_component) DEAL_II_DEPRECATED;
 
   /**
    * This function can be used when
index 6c729dc1ad47a82217da120a7d1a271e2665ecd0..e3de7b15cc0ea4f74dc67fe9cc22fc13b2fb65f3 100644 (file)
@@ -2424,7 +2424,7 @@ FEEvaluationBase<dim,dofs_per_cell_,n_q_points_,n_components_,Number>
   // loop over all local dofs. ind_local holds local number on cell, index
   // iterates over the elements of index_local_to_global and dof_indices
   // points to the global indices stored in index_local_to_global
-  const unsigned int *dof_indices = dof_info.begin_indices_plain(cell);
+  const types::global_dof_index *dof_indices = dof_info.begin_indices_plain(cell);
 
   // scalar case (or case when all components have the same degrees of freedom
   // and sit on a different vector each)
index 6e3d4ee611961f79a4889302e1930d4281bbeb05..a282ddd19e05f771492b3404065c0ec41047fe21 100644 (file)
@@ -4333,7 +4333,7 @@ namespace DoFTools
     void
     resolve_components (const FiniteElement<dim,spacedim> &fe,
                         const std::vector<unsigned char> &dofs_by_component,
-                        const std::vector<types::global_dof_index> &target_component,
+                        const std::vector<unsigned int>  &target_component,
                         const bool                        only_once,
                         std::vector<types::global_dof_index> &dofs_per_component,
                         unsigned int                     &component)
@@ -4374,7 +4374,7 @@ namespace DoFTools
     void
     resolve_components (const hp::FECollection<dim,spacedim> &fe_collection,
                         const std::vector<unsigned char> &dofs_by_component,
-                        const std::vector<types::global_dof_index> &target_component,
+                        const std::vector<unsigned int>  &target_component,
                         const bool                        only_once,
                         std::vector<types::global_dof_index> &dofs_per_component,
                         unsigned int                     &component)
@@ -4440,7 +4440,7 @@ namespace DoFTools
     const DH      &dof_handler,
     std::vector<types::global_dof_index> &dofs_per_component,
     bool only_once,
-    std::vector<types::global_dof_index>  target_component)
+    std::vector<unsigned int>  target_component)
   {
     const unsigned int n_components = dof_handler.get_fe().n_components();
 
@@ -4597,7 +4597,7 @@ namespace DoFTools
   void
   count_dofs_per_component (const DoFHandler<dim,spacedim> &dof_handler,
                             std::vector<types::global_dof_index>      &dofs_per_component,
-                            std::vector<types::global_dof_index>       target_component)
+                            std::vector<unsigned int>       target_component)
   {
     count_dofs_per_component (dof_handler, dofs_per_component,
                               false, target_component);
index 124592fb4fad8b17d3f2d3e6b5105b7f031f9c3f..787ada00eb18c96cc456732ce61075711cb5992f 100644 (file)
@@ -799,13 +799,13 @@ template
 void
 DoFTools::count_dofs_per_component<DoFHandler<deal_II_dimension> > (
   const DoFHandler<deal_II_dimension>&,
-  std::vector<types::global_dof_index>&, bool, std::vector<types::global_dof_index>);
+  std::vector<types::global_dof_index>&, bool, std::vector<unsigned int>);
 
 template
 void
 DoFTools::count_dofs_per_component<hp::DoFHandler<deal_II_dimension> > (
   const hp::DoFHandler<deal_II_dimension>&,
-  std::vector<types::global_dof_index>&, bool, std::vector<types::global_dof_index>);
+  std::vector<types::global_dof_index>&, bool, std::vector<unsigned int>);
 
 
 #if deal_II_dimension < 3
@@ -813,13 +813,13 @@ template
 void
 DoFTools::count_dofs_per_component<DoFHandler<deal_II_dimension, deal_II_dimension+1> > (
   const DoFHandler<deal_II_dimension, deal_II_dimension+1>&,
-  std::vector<types::global_dof_index>&, bool, std::vector<types::global_dof_index>);
+  std::vector<types::global_dof_index>&, bool, std::vector<unsigned int>);
 
 template
 void
 DoFTools::count_dofs_per_component<hp::DoFHandler<deal_II_dimension, deal_II_dimension+1> > (
   const hp::DoFHandler<deal_II_dimension, deal_II_dimension+1>&,
-  std::vector<types::global_dof_index>&, bool, std::vector<types::global_dof_index>);
+  std::vector<types::global_dof_index>&, bool, std::vector<unsigned int>);
 
 template
 void
@@ -845,13 +845,13 @@ template
 void
 DoFTools::count_dofs_per_component<DoFHandler<1,3> > (
   const DoFHandler<1,3>&,
-  std::vector<types::global_dof_index>&, bool, std::vector<types::global_dof_index>);
+  std::vector<types::global_dof_index>&, bool, std::vector<unsigned int>);
 
 template
 void
 DoFTools::count_dofs_per_component<hp::DoFHandler<1,3> > (
   const hp::DoFHandler<1,3>&,
-  std::vector<types::global_dof_index>&, bool, std::vector<types::global_dof_index>);
+  std::vector<types::global_dof_index>&, bool, std::vector<unsigned int>);
 
 template
 void
@@ -897,7 +897,7 @@ template
 void
 DoFTools::count_dofs_per_component<deal_II_dimension> (
   const DoFHandler<deal_II_dimension>&,
-  std::vector<types::global_dof_index>&, std::vector<types::global_dof_index>);
+  std::vector<types::global_dof_index>&, std::vector<unsigned int>);
 
 template
 void
index d014a814a2554f6f5744b77828284486135bab4c..d356360f503f6972bc29ba73661a000f17f590a7 100644 (file)
@@ -945,7 +945,7 @@ namespace MGTools
   count_dofs_per_component (const DoFHandler<dim,spacedim> &dof_handler,
                             std::vector<std::vector<types::global_dof_index> > &result,
                             bool                              only_once,
-                            std::vector<types::global_dof_index>         target_component)
+                            std::vector<unsigned int>         target_component)
   {
     const FiniteElement<dim> &fe = dof_handler.get_fe();
     const unsigned int n_components = fe.n_components();
@@ -1046,7 +1046,7 @@ namespace MGTools
   void
   count_dofs_per_component (const DoFHandler<dim,spacedim>        &dof_handler,
                             std::vector<std::vector<types::global_dof_index> > &result,
-                            std::vector<types::global_dof_index>            target_component)
+                            std::vector<unsigned int>            target_component)
   {
     count_dofs_per_component (dof_handler, result,
                               false, target_component);
index d4d787025f92f341afea72de9f9928289d50c2fa..2b9be32ad287c8ac8671fbf4f9f019216eac2232 100644 (file)
@@ -85,10 +85,10 @@ for (deal_II_dimension : DIMENSIONS)
 
       template void count_dofs_per_component (
        const DoFHandler<deal_II_dimension>&, std::vector<std::vector<types::global_dof_index> >&,
-       bool, std::vector<types::global_dof_index>);
+       bool, std::vector<unsigned int>);
       template void count_dofs_per_component (
        const DoFHandler<deal_II_dimension>&, std::vector<std::vector<types::global_dof_index> >&,
-       std::vector<types::global_dof_index>);
+       std::vector<unsigned int>);
       template void count_dofs_per_block (
        const DoFHandler<deal_II_dimension>&, std::vector<std::vector<types::global_dof_index> >&,
        std::vector<unsigned int>);
index a66f1ee0aa498e34babc2e370ef25e6dda97fff2..385a06002c9e8081ab8db0a1a62d2be501d216ee 100644 (file)
@@ -33,7 +33,7 @@ void test ()
   for (unsigned int i=0; i<9*is1.size()/10; ++i)
     is1.add_index (rand() % is1.size());
 
-  std::vector<unsigned int> indices;
+  std::vector<types::global_dof_index> indices;
   is1.fill_index_vector (indices);
 
   deallog << "Original index set: " << std::endl;
index 73ca71506a65abd1e1a647fdfeab650fe3a453d9..8b020dee3d60912e8618f4371de83512de3d7bfa 100644 (file)
@@ -725,7 +725,7 @@ namespace LaplaceSolver
     assemble_rhs (linear_system.rhs);
     linear_system.hanging_node_constraints.condense (linear_system.rhs);
 
-    std::map<unsigned int,double> boundary_value_map;
+    std::map<types::global_dof_index,double> boundary_value_map;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              *boundary_values,
index fff0e799222ab124bf1410309eb6964d5cd06d15..1ed6a8f13a6a61f2820620c914f621fde5db3a4c 100644 (file)
@@ -793,7 +793,7 @@ namespace Step22
     FullMatrix<double>   local_matrix (dofs_per_cell, dofs_per_cell);
     Vector<double>       local_rhs (dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     const RightHandSide<dim>          right_hand_side;
     std::vector<Vector<double> >      rhs_values (n_q_points,
index 7ae7707e5a50d42d87627ca92ed55546c0dbf338..a8c0282bddacbe93fd27e5bf1ebd8029a4c387d4 100644 (file)
@@ -768,7 +768,7 @@ namespace Step22
     FullMatrix<double>   local_matrix (dofs_per_cell, dofs_per_cell);
     Vector<double>       local_rhs (dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     const RightHandSide<dim>          right_hand_side;
     std::vector<Vector<double> >      rhs_values (n_q_points,
index 90af0d8dc3baa2da13f787ac4c5cb424eb525528..b3d448e349b6296532f7f4b08d9e6b2485a85043 100644 (file)
@@ -120,7 +120,7 @@ void HelmholtzProblem<dim>::assemble_system ()
   FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
   Vector<double>       cell_rhs (dofs_per_cell);
 
-  std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
   FEValues<dim>  fe_values (fe, quadrature_formula,
                             update_values   | update_gradients |
index 62ae08b977c81549a5e95ef6335faa0b2f6f6f32..6bb1da07f6b853760a891707a65137ade5c4f532 100644 (file)
@@ -98,7 +98,8 @@ void SystemTest<dim>::check ()
           deallog << "  DoF " << i << std::endl;
     };
 
-  std::vector<unsigned int> dofs_per_component (fe.n_components(), 0U);
+  std::vector<types::global_dof_index> dofs_per_component (fe.n_components(), 
+      static_cast<types::global_dof_index>(0));
   DoFTools::count_dofs_per_component (dof_handler, dofs_per_component);
   deallog << "DoFs per component: ";
   for (unsigned int i=0; i<fe.n_components(); ++i)
index f990548eb0116162ff56ec3240d8f27be807d82a..87fe8e14b6cb1cf5fc7dd6ad8d99297dc8a35a8c 100644 (file)
@@ -156,7 +156,7 @@ void FindBug<dim>::dirichlet_conditions ()
                                    // correctly implemented by now
 
 
-  std::map<unsigned int,double> dirichlet_dofs;
+  std::map<types::global_dof_index,double> dirichlet_dofs;
 
                                    // we declare a vector of bools,
                                    // which tells the
index eb9233b28e78d6f252ca221303d911ed5a21ce83..b3ed7da5a0433c7a1c2864d446fd4cfeb95c3c2a 100644 (file)
@@ -155,7 +155,7 @@ template <int dim>
 void ImposeBC<dim>::get_ready () 
 {  
   dof_handler.distribute_dofs (fe);
-  std::vector<unsigned int>    dofs_per_comp (fe.n_components());
+  std::vector<types::global_dof_index> dofs_per_comp (fe.n_components());
   DoFTools::count_dofs_per_component(dof_handler, dofs_per_comp);
        
                                    // For an FESystem with Nedelec-elements as
@@ -173,7 +173,7 @@ template <int dim>
 void ImposeBC<dim>::test_extract_boundary_DoFs () 
 {      
        
-  std::map<unsigned int, double> boundary_values;      
+  std::map<types::global_dof_index,double> boundary_values;    
   std::vector<bool>    bc_component_select(dim + 1);
         
                                    // extract boundary DoFs for the Nedelec-component
@@ -202,7 +202,7 @@ template <int dim>
 void ImposeBC<dim>::test_interpolate_BC () 
 {      
        
-  std::map<unsigned int, double> boundary_values;      
+  std::map<types::global_dof_index,double> boundary_values;    
   std::vector<bool>    bc_component_select(dim + 1, false);
   
          
index ef1221b4f7cea20ecd3205298f8c2311f6f10a3c..8610fa6310f523e0106af1750a3eca0aca8b2fb5 100644 (file)
@@ -80,13 +80,13 @@ void test ()
                                    // (1) writing them into the matrix and
                                    // applying boundary values later on, or
                                    // (2) applying them right away
-  std::map<unsigned int, double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ConstantFunction<dim>(1.),
                                            boundary_values);
   
-  std::vector<unsigned int> local_dofs (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> local_dofs (fe.dofs_per_cell);
   FullMatrix<double> local_matrix (fe.dofs_per_cell, fe.dofs_per_cell);
   Vector<double> local_vector (fe.dofs_per_cell);
   for (typename DoFHandler<dim>::active_cell_iterator
index 9632d620f866353092b44967b984923d7c3ef72b..d8eac1b06482c45d239f66c1f859dd9537310023 100644 (file)
@@ -80,13 +80,13 @@ void test ()
                                    // (1) writing them into the matrix and
                                    // applying boundary values later on, or
                                    // (2) applying them right away
-  std::map<unsigned int, double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ConstantFunction<dim>(1.),
                                            boundary_values);
   
-  std::vector<unsigned int> local_dofs (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> local_dofs (fe.dofs_per_cell);
   FullMatrix<double> local_matrix (fe.dofs_per_cell, fe.dofs_per_cell);
   Vector<double> local_vector (fe.dofs_per_cell);
   for (typename DoFHandler<dim>::active_cell_iterator
index d491375968f523247ebae75c76ee72a4752316bd..598cc96a6e4975a9a35ca5a2480f196220da6c2f 100644 (file)
@@ -52,11 +52,11 @@ void test ()
                                    // (1) writing them into the matrix and
                                    // applying boundary values later on, or
                                    // (2) applying them right away
-  std::map<unsigned int, double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   boundary_values[N/2] = 42;
 
   // then fill the matrices
-  std::vector<unsigned int> local_dofs (N);
+  std::vector<types::global_dof_index> local_dofs (N);
   FullMatrix<double> local_matrix (N,N);
   Vector<double> local_vector (N);
     {
index d14d4761d81eebcaa5889a099bfb6d1f142478d7..baa0160e1018f7fff6b5001757c5a2ea0156b5ef 100644 (file)
@@ -52,16 +52,16 @@ void test ()
                                    // (1) writing them into the matrix and
                                    // applying boundary values later on, or
                                    // (2) applying them right away
-  std::map<unsigned int, double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   boundary_values[N/2] = 42;
 
   // then fill the matrices
-  std::vector<unsigned int> local_dofs (N);
+  std::vector<types::global_dof_index> local_dofs (N);
   FullMatrix<double> local_matrix (N,N);
   Vector<double> local_vector (N);
     {
       for (unsigned int i=0; i<N; ++i)
-       local_dofs[i] = i;
+             local_dofs[i] = i;
 
       local_matrix = 0;
       for (unsigned int i=0; i<N; ++i)
index 651f330c024d9b9387fb061b945331804b38edd0..a37d073d9e907d42177d29fede5832c0a9b565b6 100644 (file)
@@ -645,7 +645,7 @@ void LaplaceProblem<dim>::assemble_system ()
                                   // from the system of equations
                                   // happens *after* the elimination
                                   // of hanging nodes.
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 3644d5103a7c9dbb51990536bde7e6b0f9ab1ee2..e74ef7281068328bf3ec62b22551985795025581 100644 (file)
@@ -80,7 +80,7 @@ void test ()
                                    // initialize object denoting zero
                                    // boundary values and boundary
                                    // constraints
-  std::map<unsigned int, double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ConstantFunction<dim>(1.),
index 4e5ab2e5ad1cb257c8106099a98e510b76de7ee8..1f051876eece24a12ce2f13a4e5ca04a7802f8f4 100644 (file)
@@ -89,7 +89,7 @@ void test ()
                                    // initialize object denoting zero
                                    // boundary values and boundary
                                    // constraints
-  std::map<unsigned int, double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            1,
                                            ConstantFunction<dim>(1.),
index d4bc46f1495eb3b25405166123848cc995e3aba3..31e1015463935916fd877aaed1ed07123471a93d 100644 (file)
@@ -373,7 +373,7 @@ namespace LaplaceSolver
     assemble_rhs (linear_system.rhs);
     linear_system.hanging_node_constraints.condense (linear_system.rhs);
 
-    std::map<unsigned int,double> boundary_value_map;
+    std::map<types::global_dof_index,double> boundary_value_map;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              *boundary_values,
index 81785870e346dcf2a3e9f66b5021e48cb0c51e3c..a0627342d3dace112edfe0eabf70ba25f4632ce3 100644 (file)
@@ -462,7 +462,7 @@ namespace LaplaceSolver
     assemble_rhs (linear_system.rhs);
     linear_system.hanging_node_constraints.condense (linear_system.rhs);
 
-    std::map<unsigned int,double> boundary_value_map;
+    std::map<types::global_dof_index,double> boundary_value_map;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              *boundary_values,
index 17ff61c14071a698de296a1f62848ca32fbb3d4d..e03034c6ff21048b530cb8a345bc3aa83fe840d0 100644 (file)
@@ -266,7 +266,7 @@ void MinimizationProblem<dim>::assemble_step ()
   hanging_node_constraints.condense (matrix);
   hanging_node_constraints.condense (residual);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 0683ef05707c5f86b54c0de5e228ca2ab22b7c1d..2844948664bfffcaa5b967b231cdf6efae505f97 100644 (file)
@@ -146,7 +146,7 @@ void LaplaceProblem<dim>::assemble_system ()
   FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
   Vector<double>       cell_rhs (dofs_per_cell);
 
-  std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
   typename DoFHandler<dim>::active_cell_iterator cell = mg_dof_handler.begin_active(),
                                                 endc = mg_dof_handler.end();
@@ -202,7 +202,7 @@ void LaplaceProblem<dim>::assemble_multigrid ()
 
   FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
 
-  std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
   typename MGDoFHandler<dim>::cell_iterator cell = mg_dof_handler.begin(),
                                            endc = mg_dof_handler.end();
index a3ec37eeef54778847ff566d51b61a6680894d9e..78e04d2aa1e9437105c04fb7bf580a968bc76c9b 100644 (file)
@@ -165,7 +165,7 @@ void LaplaceProblem::assemble_system ()
     }
 
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<2>(),
index ce1a9a59c3bb46b451d0110f150ffbd13f4091db..ffb744e7fbc5d51ca6425592c7e7fd9991c29f4c 100644 (file)
@@ -222,7 +222,7 @@ void LaplaceProblem<dim>::assemble_system ()
     }
 
   
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            BoundaryValues<dim>(),
index d5428c07b895da21dbf1bcc9ce34d2ee135d3e40..b7b51da76f277eb8654effa88f24e2d7861fe85d 100644 (file)
@@ -225,7 +225,7 @@ void LaplaceProblem<dim>::assemble_system ()
        }
     }
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 9a04d8e495fda60eee2764bc70ec8760f0b14a1c..047ac9955d0e6f22a72f8431137d424b92882373 100644 (file)
@@ -252,7 +252,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 862dda83e1c793971378835f9f34c1159a765b41..d316e512d0ef1eb8df38d74aeb3f2c7864483e17 100644 (file)
@@ -356,7 +356,7 @@ void HelmholtzProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            Solution<dim>(),
index c712be1e68e7272c10248c72e27b9c02c06212ec..3c0a107d5ad97252df48337fb228052daa6f81c4 100644 (file)
@@ -300,7 +300,7 @@ void ElasticProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(dim),
index d36f894e16eab8afc1a8edaaa955b3c13b319218..b75dcc371b68f8458774cd71a93a155d7140470c 100644 (file)
@@ -182,8 +182,8 @@ void LaplaceProblem<BlockVector<double>,BlockSparseMatrix<double>,BlockSparsityP
     {
       case 2:
       {
-       const unsigned int n_dofs = dof_handler.n_dofs();
-       const unsigned int block_size[2] = { n_dofs/3, n_dofs - n_dofs/3 };
+       const types::global_dof_index n_dofs = dof_handler.n_dofs();
+       const types::global_dof_index block_size[2] = { n_dofs/3, n_dofs - n_dofs/3 };
        
        for (unsigned int i=0; i<2; ++i)
          for (unsigned int j=0; j<2; ++j)
@@ -196,8 +196,8 @@ void LaplaceProblem<BlockVector<double>,BlockSparseMatrix<double>,BlockSparsityP
 
       case 3:
       {
-       const unsigned int n_dofs = dof_handler.n_dofs();
-       const unsigned int block_size[3] = { n_dofs/5, n_dofs/7, n_dofs - n_dofs/5 - n_dofs/7 };
+       const types::global_dof_index n_dofs = dof_handler.n_dofs();
+       const types::global_dof_index block_size[3] = { n_dofs/5, n_dofs/7, n_dofs - n_dofs/5 - n_dofs/7 };
        
        for (unsigned int i=0; i<3; ++i)
          for (unsigned int j=0; j<3; ++j)
@@ -222,9 +222,9 @@ void LaplaceProblem<BlockVector<double>,BlockSparseMatrix<double>,BlockSparsityP
     {
       case 2:
       {
-       const unsigned int n_dofs = dof_handler.n_dofs();
-       const unsigned int block_size_[2] = { n_dofs/3, n_dofs - n_dofs/3 };
-       const std::vector<unsigned int> block_size (&block_size_[0],
+       const types::global_dof_index n_dofs = dof_handler.n_dofs();
+       const types::global_dof_index block_size_[2] = { n_dofs/3, n_dofs - n_dofs/3 };
+       const std::vector<types::global_dof_index> block_size (&block_size_[0],
                                               &block_size_[2]);
        
        solution.reinit (block_size);
@@ -235,9 +235,9 @@ void LaplaceProblem<BlockVector<double>,BlockSparseMatrix<double>,BlockSparsityP
        
       case 3:
       {
-       const unsigned int n_dofs = dof_handler.n_dofs();
-       const unsigned int block_size_[3] = { n_dofs/5, n_dofs/7, n_dofs - n_dofs/5 - n_dofs/7 };
-       const std::vector<unsigned int> block_size (&block_size_[0],
+       const types::global_dof_index n_dofs = dof_handler.n_dofs();
+       const types::global_dof_index block_size_[3] = { n_dofs/5, n_dofs/7, n_dofs - n_dofs/5 - n_dofs/7 };
+       const std::vector<types::global_dof_index> block_size (&block_size_[0],
                                               &block_size_[3]);
        
        solution.reinit (block_size);
@@ -305,7 +305,7 @@ void LaplaceProblem<Vector,Matrix,Sparsity>::assemble_system ()
     };
 
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<2>(),
index 7e456053b1f9a452d5afcf4e43480488dd5c57d6..8776c33dc8974feb63d9f6597db14841082429e5 100644 (file)
@@ -70,9 +70,9 @@ boundary_q (const DoFHandler<1> &)
 }
 
 
-void write_map (const std::map<unsigned int,double> &bv)
+void write_map (const std::map<types::global_dof_index,double> &bv)
 {
-  for (std::map<unsigned int,double>::const_iterator
+  for (std::map<types::global_dof_index,double>::const_iterator
         i=bv.begin(); i!=bv.end(); ++i)
     deallog << i->first << ' ' << i->second <<std::endl;
 }
@@ -137,7 +137,7 @@ check ()
 
                                       // interpolate boundary values
       deallog << "Interpolated boundary values" << std::endl;
-      std::map<unsigned int,double> interpolated_bv;
+      std::map<types::global_dof_index,double> interpolated_bv;
       VectorTools::interpolate_boundary_values (mapping, dof, function_map,
                                                interpolated_bv, std::vector<bool>());
       write_map (interpolated_bv);
@@ -148,7 +148,7 @@ check ()
       if (dim != 3)
        {
          deallog << "Projected boundary values" << std::endl;
-         std::map<unsigned int,double> projected_bv;
+         std::map<types::global_dof_index,double> projected_bv;
          VectorTools::project_boundary_values (mapping, dof, function_map,
                                                boundary_q(dof), projected_bv);
          write_map (projected_bv);
index 2437d4dfd44287eb399e2521fe70b05c957843ef..74ed1c7223193aafb27ef6ba955e4c0a02a72482 100644 (file)
@@ -146,7 +146,7 @@ int main ()
        block_component[comp] = 2;
     }//comp
 
-  std::vector<unsigned int> dofs_per_block(3,0);//3 blocks, count dofs:
+  std::vector<types::global_dof_index> dofs_per_block(3,0);//3 blocks, count dofs:
   DoFTools::count_dofs_per_component (dh, dofs_per_block, false, block_component);
 
   DoFRenumbering::component_wise(dh, block_component);
@@ -219,8 +219,8 @@ int main ()
 
   const unsigned int   dofs_per_fl_msh_face = fluid_fe->dofs_per_face;
   const unsigned int   dofs_per_solid_face  = solid_fe->dofs_per_face;
-  std::vector<unsigned int> fl_msh_face_dof_indices (dofs_per_fl_msh_face);
-  std::vector<unsigned int> solid_face_dof_indices  (dofs_per_solid_face );
+  std::vector<types::global_dof_index> fl_msh_face_dof_indices (dofs_per_fl_msh_face);
+  std::vector<types::global_dof_index> solid_face_dof_indices  (dofs_per_solid_face );
 
   std::vector<std::pair<unsigned int, unsigned int> > solid_fluid_pairs;
   std::vector<std::pair<unsigned int, unsigned int> > solid_mesh_pairs;
@@ -313,7 +313,7 @@ int main ()
     FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
     Vector<double>       cell_rhs (dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     for (hp::DoFHandler<dim>::active_cell_iterator
           cell = dh.begin_active();
index 214439f9e43179ffec55b6c5eefc796775ba80ae..9f66092b369da8c5f8a5a1402e4c96591f90ccf5 100644 (file)
@@ -74,12 +74,12 @@ void test ()
   library_constraints.merge (correct_constraints);
 
   {
-    std::map<unsigned int,double> boundary_values;
+    std::map<types::global_dof_index,double> boundary_values;
     VectorTools::interpolate_boundary_values (dof,
                                              0,
                                              ConstantFunction<dim>(1.),
                                              boundary_values);
-    std::map<unsigned int,double>::const_iterator boundary_value = 
+    std::map<types::global_dof_index,double>::const_iterator boundary_value = 
       boundary_values.begin();
     for ( ; boundary_value !=boundary_values.end(); ++boundary_value)
       {
@@ -110,7 +110,7 @@ void test ()
     {
       Assert (correct_constraints.is_constrained(i) ==
              library_constraints.is_constrained(i), ExcInternalError());
-      typedef const std::vector<std::pair<unsigned int, double> >& constraint_format;
+      typedef const std::vector<std::pair<types::global_dof_index, double> >& constraint_format;
       if (correct_constraints.is_constrained(i))
        {
          constraint_format correct = *correct_constraints.get_constraint_entries(i);
index 51b119e3a8857f71dbd0a13410adb8218de5acb3..408de4c7d1303669f33fe11d1c7d9deb6c08752b 100644 (file)
@@ -70,7 +70,7 @@ void test ()
   FullMatrix<double> full (dof.n_dofs(), dof.n_dofs());
 
   FullMatrix<double> local_mat (fe.dofs_per_cell, fe.dofs_per_cell);
-  std::vector<unsigned int> local_dof_indices (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (fe.dofs_per_cell);
 
                                // loop over cells, fill local matrix with
                                // random values, insert both into sparse and
index 563805514236c04ccfc4891769e4b570cbebf713..2424cb08563512905cd2779d2489215e932aecd3 100644 (file)
@@ -74,7 +74,7 @@ void test (unsigned int chunk_size)
   ChunkSparseMatrix<double> chunk_sparse (chunk_sparsity);
 
   FullMatrix<double> local_mat (fe.dofs_per_cell, fe.dofs_per_cell);
-  std::vector<unsigned int> local_dof_indices (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (fe.dofs_per_cell);
 
                                // loop over cells, fill local matrix with
                                // random values, insert both into sparse and
index f84ca57aaa3d473cbc9d4c65044409360c74a443..2fe49827be0c47d041055f5e36f64d89e7f26870 100644 (file)
@@ -60,7 +60,7 @@ void test (const Triangulation<dim>& tr,
     .get_function_divergences (fe_function, divergences);
 
                                   // now do the same "by hand"
-  std::vector<unsigned int> local_dof_indices (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (fe.dofs_per_cell);
   dof.begin_active()->get_dof_indices (local_dof_indices);
   
   for (unsigned int q=0; q<quadrature.size(); ++q)
index 4f041503484da6886aa1c3830008b147b5184c43..ca4be6c16d69ee9cae6db66e4e9b3ea672f43688 100644 (file)
@@ -60,7 +60,7 @@ void test (const Triangulation<dim>& tr,
     .get_function_divergences (fe_function, divergences);
 
                                   // now do the same "by hand"
-  std::vector<unsigned int> local_dof_indices (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (fe.dofs_per_cell);
   dof.begin_active()->get_dof_indices (local_dof_indices);
   
   for (unsigned int i=0; i<fe.dofs_per_cell; ++i)
index fb5931fd46849e52f61b039516ed215ddd762640..defae1be937c6e5284b7ab481aec4a72be7861a9 100644 (file)
@@ -59,7 +59,7 @@ void test (const Triangulation<dim>& tr,
     .get_function_divergences (fe_function, divergences);
 
                                   // now do the same "by hand"
-  std::vector<unsigned int> local_dof_indices (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (fe.dofs_per_cell);
   dof.begin_active()->get_dof_indices (local_dof_indices);
 
   for (unsigned int i=0; i<fe.dofs_per_cell; ++i)
index 3aa08931f44bea801720322ba3500d4dd2c7d5d7..6920559810baf9d030faea5e8a79e7a3e9dbbc9a 100644 (file)
@@ -199,7 +199,7 @@ void LaplaceProblem<dim>::setup_system ()
                                   // function.
   {
     test_all_constraints.merge (hanging_nodes_only);
-    std::map<unsigned int,double> boundary_values;
+    std::map<types::global_dof_index,double> boundary_values;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              BoundaryValues<dim>(),
@@ -337,7 +337,7 @@ void LaplaceProblem<dim>::assemble_reference ()
     }
 
   hanging_nodes_only.condense (reference_matrix, reference_rhs);
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            BoundaryValues<dim>(),
index 023dda873ee51a02106bb943879994ace874f87f..2559eaed474385e9fda136d0a16da58baf9c2303 100644 (file)
@@ -114,7 +114,7 @@ void test(bool use_constraint_matrix)
          rhs (local_dofs2[i]) += local_vec (i);
        }
 
-      std::map<unsigned int, double>     boundary_values;
+      std::map<types::global_dof_index,double> boundary_values;
       boundary_values.insert (std::pair<unsigned int,double>(1, -5.0));
       boundary_values.insert (std::pair<unsigned int,double>(3, 2.0));
       boundary_values.insert (std::pair<unsigned int,double>(4, 0.0));
index 76d6ceb00ef3cc97002550040712a4e66fc22365..88881930a8cbc315c88615eea8023d4ad2ccffa0 100644 (file)
@@ -130,7 +130,7 @@ void AdvectionProblem<dim>::setup_system ()
                                   // add boundary conditions as
                                   // inhomogeneous constraints here.
   {
-    std::map<unsigned int,double> boundary_values;
+    std::map<types::global_dof_index,double> boundary_values;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              ConstantFunction<dim>(1.,2),
@@ -312,7 +312,7 @@ void AdvectionProblem<dim>::assemble_reference ()
 
                                   // use some other rhs vector as dummy for
                                   // application of Dirichlet conditions
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ConstantFunction<dim>(1.,2),
index 87db51fd37bd3df195ed8fc258a3c3075a89c8d0..5fa66fa1250242626259a21eee71afab77bdc724 100644 (file)
@@ -134,7 +134,7 @@ void AdvectionProblem<dim>::setup_system ()
                                   // take the right hand side function as
                                   // boundary function
   {
-    std::map<unsigned int,double> boundary_values;
+    std::map<types::global_dof_index,double> boundary_values;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              RightHandSide<dim>(),
@@ -276,7 +276,7 @@ void AdvectionProblem<dim>::assemble_reference ()
 
                                   // use some other rhs vector as dummy for
                                   // application of Dirichlet conditions
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            RightHandSide<dim>(),
index fdb148c732b04b2ab6b3b7fac5fcb1c4167ba2d1..985ab1c6da98a8bc570594e174c449472fdc967a 100644 (file)
@@ -54,7 +54,7 @@ void test ()
 
   dof_handler.distribute_dofs (fe);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                             10,
                                             Functions::SquareFunction<dim>(),
index 6c2fd84d83ead4eb27e63e0f04578702bc7faf52..ecaf5c4584413b005048531d1cdc1b3cc8ed1e19 100644 (file)
@@ -199,7 +199,7 @@ void Step6<dim>::assemble_system ()
   FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
   Vector<double>       cell_rhs (dofs_per_cell);
 
-  std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
   const Coefficient<dim> coefficient;
   std::vector<double>    coefficient_values (n_q_points);
@@ -246,7 +246,7 @@ void Step6<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                             0,
                                             ZeroFunction<dim>(),
index 272c1712981b5e74c1edbb5b3ef6d75291ce970e..e833c75cbb56564c358fcd7f35164c985484429e 100644 (file)
@@ -216,7 +216,7 @@ void TestPointValueHistory<dim>::run()
         Quadrature<dim> quadrature_formula(finite_element.get_unit_support_points ());
         FEValues<dim> fe_values(finite_element, quadrature_formula, update_values | update_quadrature_points); // just need local_dof_indices and quadrature_points
 
-        std::vector<unsigned int> local_dof_indices(finite_element.dofs_per_cell);
+        std::vector<types::global_dof_index> local_dof_indices(finite_element.dofs_per_cell);
         std::vector<Point<dim> > dof_locations(finite_element.dofs_per_cell);
 
         typename DoFHandler<dim>::active_cell_iterator cell, endc;
index 040dcda29f4970fc7d6c7ee8aac78e403b6d6292..8f3b9a55c8b262ebc97424f8c386c5a1ca7cc257 100644 (file)
@@ -185,7 +185,7 @@ void TestPointValueHistory<dim>::run()
         Quadrature<dim> quadrature_formula(finite_element.get_unit_support_points ());
         FEValues<dim> fe_values(finite_element, quadrature_formula, update_values | update_quadrature_points); // just need local_dof_indices and quadrature_points
 
-        std::vector<unsigned int> local_dof_indices(finite_element.dofs_per_cell);
+        std::vector<types::global_dof_index> local_dof_indices(finite_element.dofs_per_cell);
         std::vector<Point<dim> > dof_locations(finite_element.dofs_per_cell);
 
         typename DoFHandler<dim>::active_cell_iterator cell, endc;
index 03956767ee83c7951a2b91c5ad753daf7600d288..ded8515509bbd6d9171c22308818e03b7ed4c88c 100644 (file)
@@ -84,7 +84,7 @@ void test()
       triangulation.execute_coarsening_and_refinement ();
       dof_handler.distribute_dofs (fe);
 
-      std::vector<unsigned int> dofs_per_block (fe.n_components());
+      std::vector<types::global_dof_index> dofs_per_block (fe.n_components());
       DoFTools::count_dofs_per_block (dof_handler, dofs_per_block);
 
       Assert (std::accumulate (dofs_per_block.begin(), dofs_per_block.end(), 0U)
index 2b555470c3b06d4145067b9e014a33fcd385b81a..777a8b65d66b61ebbe440f378b79deb9f28760d0 100644 (file)
@@ -252,7 +252,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
   condense.stop();
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index b14472954a24df2f202948b0a032a4cfe93df529..1f9bfb206de7f7ba4811de005a38c6fa5112158d 100644 (file)
@@ -459,7 +459,7 @@ namespace LaplaceSolver
     assemble_rhs (linear_system.rhs);
     linear_system.hanging_node_constraints.condense (linear_system.rhs);
 
-    std::map<unsigned int,double> boundary_value_map;
+    std::map<types::global_dof_index,double> boundary_value_map;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              *boundary_values,
index d980e29acdf55ea7578cc38cf3c56a418aae8158..34211101134cb4a89c75cb14cddf7d86cc4d1012 100644 (file)
@@ -267,7 +267,7 @@ void MinimizationProblem<dim>::assemble_step ()
   hanging_node_constraints.condense (matrix);
   hanging_node_constraints.condense (residual);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 51ace17b4f43ac10af2bda911b9ee71c375c701e..3594d76bb53922c9e4cbe26504a1758690b72118 100644 (file)
@@ -163,7 +163,7 @@ void create_mass_matrix (const Mapping<dim>       &mapping,
   std::vector<Vector<double> > coefficient_vector_values (n_q_points,
                                                          Vector<double> (n_components));
 
-  std::vector<unsigned int> dof_indices (dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices (dofs_per_cell);
 
   std::vector<Vector<double> > rhs_values(n_q_points, Vector<double>(n_components));
 
@@ -436,7 +436,7 @@ void project (const Mapping<dim>       &mapping,
   const FiniteElement<dim> &fe = dof.get_fe();
 
                                   // make up boundary values
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
 
   if (enforce_zero_boundary == true)
                                     // no need to project boundary
@@ -467,7 +467,7 @@ void project (const Mapping<dim>       &mapping,
                                       // one line or one vertex
       typename DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
                                                     endc = dof.end();
-      std::vector<unsigned int> face_dof_indices (fe.dofs_per_face);
+      std::vector<types::global_dof_index> face_dof_indices (fe.dofs_per_face);
       for (; cell!=endc; ++cell)
        for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
          if (cell->face(f)->at_boundary())
index 5259b26a732b06af6324d44a114299e60929917d..846d7bdfd62a67d123d2f5e4ad984cf47506ea77 100644 (file)
@@ -213,7 +213,7 @@ void create_mass_matrix (const Mapping<dim>       &mapping,
   std::vector<Vector<double> > coefficient_vector_values (n_q_points,
                                                          Vector<double> (n_components));
 
-  std::vector<unsigned int> dof_indices (dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices (dofs_per_cell);
 
   std::vector<Vector<double> > rhs_values(n_q_points, Vector<double>(n_components));
 
@@ -286,7 +286,7 @@ void create_mass_matrix (const Mapping<dim>       &mapping,
                                           // between two faces.
          std::vector<double> sign_change (dofs_per_cell, 1.0);
          const unsigned int dofs_per_face = fe.dofs_per_face;
-         std::vector<unsigned int> face_dof_indices (dofs_per_face);
+         std::vector<types::global_dof_index> face_dof_indices (dofs_per_face);
 
          for (unsigned int f = 0; f < 2; ++f)
            {
@@ -398,7 +398,7 @@ void create_right_hand_side (const Mapping<dim>    &mapping,
                     n_q_points    = fe_values.n_quadrature_points,
                     n_components  = fe.n_components();
 
-  std::vector<unsigned int> dofs (dofs_per_cell);
+  std::vector<types::global_dof_index> dofs (dofs_per_cell);
   Vector<double> cell_vector (dofs_per_cell);
 
   typename DoFHandler<dim>::active_cell_iterator cell = dof_handler.begin_active(),
@@ -483,7 +483,7 @@ void project (const Mapping<dim>       &mapping,
   const FiniteElement<dim> &fe = dof.get_fe();
 
                                   // make up boundary values
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
 
   if (enforce_zero_boundary == true)
                                     // no need to project boundary
@@ -514,7 +514,7 @@ void project (const Mapping<dim>       &mapping,
                                       // one line or one vertex
       typename DoFHandler<dim>::active_cell_iterator cell = dof.begin_active(),
                                                     endc = dof.end();
-      std::vector<unsigned int> face_dof_indices (fe.dofs_per_face);
+      std::vector<types::global_dof_index> face_dof_indices (fe.dofs_per_face);
       for (; cell!=endc; ++cell)
        for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
          if (cell->face(f)->at_boundary())
@@ -647,7 +647,7 @@ void plot_shapes (DoFHandler<2> &dof_handler)
                                   // Create set of all DoFs, which are on the boundary.
   DoFHandler<2>::active_cell_iterator cell = dof_handler.begin_active(),
                                               endc = dof_handler.end();
-  std::vector<unsigned int> face_dof_indices (dof_handler.get_fe().dofs_per_face);
+  std::vector<types::global_dof_index> face_dof_indices (dof_handler.get_fe().dofs_per_face);
   for (; cell!=endc; ++cell)
     for (unsigned int f=0; f<GeometryInfo<2>::faces_per_cell; ++f)
       {
index 76adec4a9c7da17f057ae774f710dd7cad7d5d24..17156aaeffe8141ea6c2e05d9029560c6480578d 100644 (file)
@@ -433,7 +433,7 @@ namespace Step22
       typename DoFHandler<dim>::active_cell_iterator
       cell = dof_handler.begin_active(),
       endc = dof_handler.end();
-      std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+      std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
       cell->get_dof_indices(local_dof_indices);
       unsigned int first_disc_dof=local_dof_indices[dofs_per_cell-1];
@@ -518,7 +518,7 @@ namespace Step22
     FullMatrix<double>   local_matrix (dofs_per_cell, dofs_per_cell);
     Vector<double>       local_rhs (dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     const RightHandSide<dim>          right_hand_side;
     std::vector<Vector<double> >      rhs_values (n_q_points,
@@ -889,7 +889,7 @@ namespace Step22
     cell = dof_handler.begin_active(),
     endc = dof_handler.end();
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
     for (; cell!=endc; ++cell)
       {
         fe_v.reinit(cell);
index 8cd46bc85d39aa0f9a19296caa4c76023aedcc65..64172db00da9bdd718183862705d320317473d25 100644 (file)
@@ -185,7 +185,7 @@ namespace with_hp
       }
 
 
-    std::map<unsigned int,double> boundary_values;
+    std::map<types::global_dof_index,double> boundary_values;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              exact_solution,
@@ -334,7 +334,7 @@ namespace without_hp
       }
 
 
-    std::map<unsigned int,double> boundary_values;
+    std::map<types::global_dof_index,double> boundary_values;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              exact_solution,
index a921f8e04f3c6f2f2645869aeb4726db463975b7..4e84707b3550cd9b96e6f0b9872a0b22d3abdd69 100644 (file)
@@ -40,7 +40,7 @@ std::string output_file_name = "count_dofs_per_block_01/output";
 
 
 
-void print (const std::vector<unsigned int> &v)
+void print (const std::vector<types::global_dof_index> &v)
 {
   deallog << v.size();
   for (unsigned int i=0; i<v.size(); ++i)
@@ -84,13 +84,13 @@ check ()
 
                                   // no grouping
   {
-    std::vector<unsigned int> dpc(dim+1);
+    std::vector<types::global_dof_index> dpc(dim+1);
     DoFTools::count_dofs_per_component (dof_handler, dpc);
     print (dpc);
   }
 
   {
-    std::vector<unsigned int> dpc(dim+1);
+    std::vector<types::global_dof_index> dpc(dim+1);
     DoFTools::count_dofs_per_block (dof_handler, dpc);
     print (dpc);
   }
@@ -101,7 +101,7 @@ check ()
   {
     std::vector<unsigned int> group(dim+1, 0);
     group[dim] = 1;
-    std::vector<unsigned int> dpc(2);
+    std::vector<types::global_dof_index> dpc(2);
     DoFTools::count_dofs_per_component (dof_handler, dpc, false, group);
     Assert (dpc.size() == 2, ExcInternalError());
     print (dpc);
@@ -110,7 +110,7 @@ check ()
   {
     std::vector<unsigned int> group(dim+1, 0);
     group[dim] = 1;
-    std::vector<unsigned int> dpc(2);
+    std::vector<types::global_dof_index> dpc(2);
     DoFTools::count_dofs_per_block (dof_handler, dpc, group);
     Assert (dpc.size() == 2, ExcInternalError());
     print (dpc);
@@ -121,7 +121,7 @@ check ()
   {
     std::vector<unsigned int> group(dim+1, 2*dim);
     group[dim] = 0;
-    std::vector<unsigned int> dpc(2*dim+1);
+    std::vector<types::global_dof_index> dpc(2*dim+1);
     DoFTools::count_dofs_per_component (dof_handler, dpc, false, group);
     Assert (dpc.size() == 2*dim+1, ExcInternalError());
     print (dpc);
@@ -130,7 +130,7 @@ check ()
   {
     std::vector<unsigned int> group(dim+1, 2*dim);
     group[dim] = 0;
-    std::vector<unsigned int> dpc(2*dim+1);
+    std::vector<types::global_dof_index> dpc(2*dim+1);
     DoFTools::count_dofs_per_block (dof_handler, dpc, group);
     Assert (dpc.size() == 2*dim+1, ExcInternalError());
     print (dpc);
index 9a2bb0d3e9ea34ad76fd0eb9194736999bfbabbf..be9ebed74a86b77b4ba179b6e115402b26b681ae 100644 (file)
@@ -40,7 +40,7 @@ std::string output_file_name = "count_dofs_per_block_02/output";
 
 
 
-void print (const std::vector<unsigned int> &v)
+void print (const std::vector<types::global_dof_index> &v)
 {
   deallog << v.size();
   for (unsigned int i=0; i<v.size(); ++i)
@@ -84,13 +84,13 @@ check ()
 
                                   // no grouping
   {
-    std::vector<unsigned int> dpc(dim+1);
+    std::vector<types::global_dof_index> dpc(dim+1);
     DoFTools::count_dofs_per_component (dof_handler, dpc);
     print (dpc);
   }
 
   {
-    std::vector<unsigned int> dpc(dim+1);
+    std::vector<types::global_dof_index> dpc(dim+1);
     DoFTools::count_dofs_per_block (dof_handler, dpc);
     print (dpc);
   }
@@ -101,7 +101,7 @@ check ()
   {
     std::vector<unsigned int> group(dim+1, 0);
     group[dim] = 1;
-    std::vector<unsigned int> dpc(2);
+    std::vector<types::global_dof_index> dpc(2);
     DoFTools::count_dofs_per_component (dof_handler, dpc, false, group);
     Assert (dpc.size() == 2, ExcInternalError());
     print (dpc);
@@ -110,7 +110,7 @@ check ()
   {
     std::vector<unsigned int> group(dim+1, 0);
     group[dim] = 1;
-    std::vector<unsigned int> dpc(2);
+    std::vector<types::global_dof_index> dpc(2);
     DoFTools::count_dofs_per_block (dof_handler, dpc, group);
     Assert (dpc.size() == 2, ExcInternalError());
     print (dpc);
@@ -121,7 +121,7 @@ check ()
   {
     std::vector<unsigned int> group(dim+1, 2*dim);
     group[dim] = 0;
-    std::vector<unsigned int> dpc(2*dim+1);
+    std::vector<types::global_dof_index> dpc(2*dim+1);
     DoFTools::count_dofs_per_component (dof_handler, dpc, false, group);
     Assert (dpc.size() == 2*dim+1, ExcInternalError());
     print (dpc);
@@ -130,7 +130,7 @@ check ()
   {
     std::vector<unsigned int> group(dim+1, 2*dim);
     group[dim] = 0;
-    std::vector<unsigned int> dpc(2*dim+1);
+    std::vector<types::global_dof_index> dpc(2*dim+1);
     DoFTools::count_dofs_per_block (dof_handler, dpc, group);
     Assert (dpc.size() == 2*dim+1, ExcInternalError());
     print (dpc);
index 897eea8e9b3cea4a261bd68e63a75ce7b3948a1c..88a24a54b74c96e9b33c5a88850fadbec46d2a09 100644 (file)
@@ -120,7 +120,7 @@ int main ()
       deallog << "    active_fe_index=" << cell->active_fe_index() << std::endl;
 
       deallog << "    dofs=";
-      std::vector<unsigned int> local_dofs (fe[cell->active_fe_index()].dofs_per_cell);
+      std::vector<types::global_dof_index> local_dofs (fe[cell->active_fe_index()].dofs_per_cell);
       cell->get_dof_indices (local_dofs);
       for (unsigned int i=0; i<fe[cell->active_fe_index()].dofs_per_cell; ++i)
        deallog << local_dofs[i] << ' ';
index ff1889bb7d443d18ade38753a75b807985dddf56..b7c77602d6a3ceed277702ca2380646898b6fcf4 100644 (file)
@@ -125,7 +125,7 @@ int main ()
          for (unsigned int i=0; i<3; ++i)
            {
              deallog << "DoF indices for fe_index=" << i << ": ";
-             std::vector<unsigned int> line_dofs (fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex);
+             std::vector<types::global_dof_index> line_dofs (fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex);
              cell->line(l)->get_dof_indices (line_dofs, i);
              for (unsigned int j=0; j<fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex; ++j)
                deallog << line_dofs[j] << ' ';
index 2ffe000a40fd0aa074fbc32da20a03dfc91d8632..7eb1326d96289b693601124842a4990c8cc62154 100644 (file)
@@ -78,7 +78,7 @@ void test ()
        deallog << "cell=" << cell << ", face=" << f
                << ", fe_index=" << cell->active_fe_index()
                << ", dofs=";
-       std::vector<unsigned int> dofs (fe[cell->active_fe_index()].dofs_per_face);
+       std::vector<types::global_dof_index> dofs (fe[cell->active_fe_index()].dofs_per_face);
        cell->face(f)->get_dof_indices (dofs,
                                        cell->active_fe_index());
        for (unsigned int i=0; i<dofs.size(); ++i)
index 6cfab9476f479258b1bbf66c8e5e136181bb5f1f..e5213ddbe647ef6b5429cbe2a2822ceb57340ae2 100644 (file)
@@ -111,7 +111,7 @@ int main ()
          for (unsigned int i=0; i<4; ++i)
            {
              deallog << "DoF indices for fe_index=" << i << ": ";
-             std::vector<unsigned int> line_dofs (fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex);
+             std::vector<types::global_dof_index> line_dofs (fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex);
              cell->line(l)->get_dof_indices (line_dofs, i);
              for (unsigned int j=0; j<fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex; ++j)
                deallog << line_dofs[j] << ' ';
index f168376adf34b9c1d6622a5422a931cab8e6d37a..c5d86f47b36a13ecc90c6994236500104a401580 100644 (file)
@@ -62,8 +62,8 @@ void test ()
   
       dof_handler.distribute_dofs(fe_collection);
 
-      std::vector<unsigned int> face_dof_indices;
-      std::vector<unsigned int> neighbor_face_dof_indices;
+      std::vector<types::global_dof_index> face_dof_indices;
+      std::vector<types::global_dof_index> neighbor_face_dof_indices;
       for (typename hp::DoFHandler<dim>::active_cell_iterator
             cell=dof_handler.begin_active();
           cell!=dof_handler.end(); ++cell)
index a1c55098f207d95e377fbd4241f7ded0cfdf30d4..533a3b60f25fcbd01b5925ee59472e1ba4fb25b1 100644 (file)
@@ -65,9 +65,9 @@ void test ()
   
   dof_handler.distribute_dofs(fe_collection);
 
-  std::vector<unsigned int> line_dof_indices_1 (fe_collection[0].dofs_per_line +
+  std::vector<types::global_dof_index> line_dof_indices_1 (fe_collection[0].dofs_per_line +
                                                2 * fe_collection[0].dofs_per_vertex);
-  std::vector<unsigned int> line_dof_indices_2 (fe_collection[0].dofs_per_line +
+  std::vector<types::global_dof_index> line_dof_indices_2 (fe_collection[0].dofs_per_line +
                                                2 * fe_collection[0].dofs_per_vertex);
 
   for (typename hp::DoFHandler<dim>::active_cell_iterator
index faf3c521f43816945e3899b2ab6bcae6726aafe5..a44d8802eb9fce4b1a74423b2041d08e7e1794f5 100644 (file)
@@ -252,7 +252,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
   condense.stop();
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 8e67bcdf6ffc635d5e4ed952c7d014c041b5c5ce..efcc55398381c60e832cac1a56717cffa208cd5f 100644 (file)
@@ -254,7 +254,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
   condense.stop();
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 1cc41934ead72466f8c1109918f3872346cfa826..9feee0968e9b1ab6a681104fc27423ded58ad7cc 100644 (file)
@@ -257,7 +257,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
   condense.stop();
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 34dd18c58f9ba6fa6c256291e17d9640f14c6cbe..bdb1a0d556e8cb2c7554bdaf86185e8ca62e7237 100644 (file)
@@ -260,7 +260,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
   condense.stop();
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 36af88503dbee8161dd78fe3bda36378a6a44a17..d6add85e3df12f7b9c6fed2141942b3dc4633135 100644 (file)
@@ -89,7 +89,7 @@ void test ()
          << std::endl;
 
   ExactSolution<dim> exact_solution;
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                             0,
                                             exact_solution,
index c20ef92635be37884420371c1fc90e028ca8e28e..8d79e1dcf0582b21e90b4970b1a906f400d26cc8 100644 (file)
@@ -164,7 +164,7 @@ void test ()
       {
        deallog << cell << ' ' << cell->active_fe_index() << std::endl
                << "   ";
-       std::vector<unsigned int> local_dof_indices (cell->get_fe().dofs_per_cell);
+       std::vector<types::global_dof_index> local_dof_indices (cell->get_fe().dofs_per_cell);
        cell->get_dof_indices (local_dof_indices);
 
        for (unsigned int i=0; i<cell->get_fe().dofs_per_cell; ++i)
index 5868f6f9e6dfd5594731d360e0fe52b8e3219921..8aa8c34ad989988421ac84639b8038c33b6ba284 100644 (file)
@@ -96,7 +96,7 @@ void test ()
       {
        deallog << cell << ' ' << cell->active_fe_index() << std::endl
                << "   ";
-       std::vector<unsigned int> local_dof_indices (cell->get_fe().dofs_per_cell);
+       std::vector<types::global_dof_index> local_dof_indices (cell->get_fe().dofs_per_cell);
        cell->get_dof_indices (local_dof_indices);
 
        for (unsigned int i=0; i<cell->get_fe().dofs_per_cell; ++i)
index d5247edcd8abfa125019f25a934f8ba971664893..27ef93a9f7c35e395f4854f0f34cd0a01c7e9e3a 100644 (file)
@@ -99,7 +99,7 @@ void test ()
       {
        deallog << cell << ' ' << cell->active_fe_index() << std::endl
                << "   ";
-       std::vector<unsigned int> local_dof_indices (cell->get_fe().dofs_per_cell);
+       std::vector<types::global_dof_index> local_dof_indices (cell->get_fe().dofs_per_cell);
        cell->get_dof_indices (local_dof_indices);
 
        for (unsigned int i=0; i<cell->get_fe().dofs_per_cell; ++i)
index f5890e6702d175ad0c85824838c26d6ee9f5bb37..05bb61ac29d13b2c9216f5a8740241da889005d9 100644 (file)
@@ -112,7 +112,7 @@ void test ()
       {
        deallog << cell << ' ' << cell->active_fe_index() << std::endl
                << "   ";
-       std::vector<unsigned int> local_dof_indices (cell->get_fe().dofs_per_cell);
+       std::vector<types::global_dof_index> local_dof_indices (cell->get_fe().dofs_per_cell);
        cell->get_dof_indices (local_dof_indices);
 
        for (unsigned int i=0; i<cell->get_fe().dofs_per_cell; ++i)
index b4e278c411c3ecce747e9b06008368f530d39315..2614a990d00b2f3fa4aa8252a83ed13a18058748 100644 (file)
@@ -68,7 +68,7 @@ check ()
   dof.distribute_dofs(fe_collection);
 
   std::vector<bool> touched(dof.n_dofs(), false);
-  std::vector<unsigned int> local_dof_indices;
+  std::vector<types::global_dof_index> local_dof_indices;
   for (typename hp::DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
         cell != dof.end(); ++cell)
     {
index 88a992d8d9d58ebd5894fb5def8cd2550bb9ac2c..792283ed04a0f4203e3fc7fff65b100e4591657a 100644 (file)
@@ -373,7 +373,7 @@ namespace LaplaceSolver
     assemble_rhs (linear_system.rhs);
     linear_system.hanging_node_constraints.condense (linear_system.rhs);
 
-    std::map<unsigned int,double> boundary_value_map;
+    std::map<types::global_dof_index,double> boundary_value_map;
     VectorTools::interpolate_boundary_values (dof_handler,
                                              0,
                                              *boundary_values,
index 74ecfd0b558c12da308a503249f3b31ae9b8c060..5b007f16851819326a3c4afdf0ef377e6a9e1a0c 100644 (file)
@@ -165,7 +165,7 @@ void LaplaceProblem::assemble_system ()
     }
 
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<2>(),
index cf1f98bf4f97c2e0e7e934ca90fab0c81c331062..6532629e8b19b6e29ca2103654519337f915ed06 100644 (file)
@@ -205,7 +205,7 @@ void LaplaceProblem::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
   
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<2>(),
index 45fcdf156e4a8b2833eb24b9c9c17b9421d7419e..6db87c12933db65eac98af2f673f29f005a02141 100644 (file)
@@ -202,7 +202,7 @@ void LaplaceProblem::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
   
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<2>(),
index ecb41f18ca5fb9a400e6a2f50bb2d6d82c214985..96e399ba09c0f4b3985c8d6b5f3373c5a3a2157d 100644 (file)
@@ -204,7 +204,7 @@ void LaplaceProblem::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
   
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<2>(),
index 05602407f4ad67a337f3a28d50535f35faff1705..532bc2d4c181e52387a2c99a0d6f1fc05368d882 100644 (file)
@@ -221,7 +221,7 @@ void LaplaceProblem<dim>::assemble_system ()
     }
 
   
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            BoundaryValues<dim>(),
index 0b5b5b2d9b15de3f677a8a796298b11e6ecf480f..8b2d291796db6c1af4844bfd0e87d645468ebed4 100644 (file)
@@ -224,7 +224,7 @@ void LaplaceProblem<dim>::assemble_system ()
        }
     }
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 2d61cfb488c9ebbbb71ebf085710d64be5690b4f..6fe5644e299f0261d4f6dfa854784a814b421c19 100644 (file)
@@ -251,7 +251,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(),
index 91c0575cce0b0183f600dd57c07bc365997f0ab4..cb053c49ab5223a89950e65fbaafa446e6b8fc6d 100644 (file)
@@ -355,7 +355,7 @@ void HelmholtzProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            Solution<dim>(),
index 93e97abf343895ba6622c8f77bea0b54c95662d1..02d6704c796334028f4ccc93fa7a2b7bb9aaa82a 100644 (file)
@@ -299,7 +299,7 @@ void ElasticProblem<dim>::assemble_system ()
   hanging_node_constraints.condense (system_matrix);
   hanging_node_constraints.condense (system_rhs);
 
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(dim),
index fe07a8235fa3ae726c664777e2069f3bf562ee54..c083bb3941a6bc1e13ad538d3fe04995d03ba71b 100644 (file)
@@ -49,7 +49,7 @@ void test_cell(const FEValuesBase<dim>& fev, const FEValuesBase<dim>& fes)
   std::vector<std::vector<Tensor<1,dim> > >
     ugrad(dim,std::vector<Tensor<1,dim> >(fev.n_quadrature_points));
   
-  std::vector<unsigned int> indices(nv);
+  std::vector<types::global_dof_index> indices(nv);
   for (unsigned int i=0;i<nv;++i)
     indices[i] = i;
   
@@ -105,7 +105,7 @@ void test_boundary(const FEValuesBase<dim>& fev, const FEValuesBase<dim>& fes)
   std::vector<std::vector<double> >
     uval    (dim,std::vector<double>(fev.n_quadrature_points));
   
-  std::vector<unsigned int> indices(nv);
+  std::vector<types::global_dof_index> indices(nv);
   for (unsigned int i=0;i<nv;++i)
     indices[i] = i;
   
index b3234e4e299934fa6b7f5d2d4a6b996c960789a2..e8129c1ad2bc48335f7c0d1dd435d69c5d77b0b2 100644 (file)
@@ -38,7 +38,7 @@ void test_cell(const FEValuesBase<dim>& fev)
   std::vector<std::vector<Tensor<1,dim> > >
     ugrad(dim,std::vector<Tensor<1,dim> >(fev.n_quadrature_points));
   
-  std::vector<unsigned int> indices(n);
+  std::vector<types::global_dof_index> indices(n);
   for (unsigned int i=0;i<n;++i)
     indices[i] = i;
   
@@ -74,7 +74,7 @@ void test_boundary(const FEValuesBase<dim>& fev)
   std::vector<std::vector<Tensor<1,dim> > >
     ugrad   (d,std::vector<Tensor<1,dim> >(fev.n_quadrature_points));
   
-  std::vector<unsigned int> indices(n);
+  std::vector<types::global_dof_index> indices(n);
   for (unsigned int i=0;i<n;++i)
     indices[i] = i;
   
@@ -133,7 +133,7 @@ void test_face(const FEValuesBase<dim>& fev1,
     u1grad(d,std::vector<Tensor<1,dim> >(fev1.n_quadrature_points)),
     u2grad(d,std::vector<Tensor<1,dim> >(fev2.n_quadrature_points));
   
-  std::vector<unsigned int> indices1(n1), indices2(n2);
+  std::vector<types::global_dof_index> indices1(n1), indices2(n2);
   for (unsigned int i=0;i<n1;++i) indices1[i] = i;
   for (unsigned int i=0;i<n2;++i) indices2[i] = i;
   
index cb21c94d0dbac18ef333cd8a03d2a62e878c0f23..df9736b9ce61c643a4ba8d4703f10121330bd1ed 100644 (file)
@@ -37,7 +37,7 @@ void test_cell(const FEValuesBase<dim>& fev)
   std::vector<std::vector<Tensor<1,dim> > >
     ugrad(d,std::vector<Tensor<1,dim> >(fev.n_quadrature_points));
   
-  std::vector<unsigned int> indices(n);
+  std::vector<types::global_dof_index> indices(n);
   for (unsigned int i=0;i<n;++i)
     indices[i] = i;
   
@@ -80,7 +80,7 @@ void test_boundary(const FEValuesBase<dim>& fev)
   std::vector<std::vector<Tensor<1,dim> > >
     ugrad   (d,std::vector<Tensor<1,dim> >(fev.n_quadrature_points));
   
-  std::vector<unsigned int> indices(n);
+  std::vector<types::global_dof_index> indices(n);
   for (unsigned int i=0;i<n;++i)
     indices[i] = i;
   
@@ -139,7 +139,7 @@ void test_face(const FEValuesBase<dim>& fev1,
     u1grad(d,std::vector<Tensor<1,dim> >(fev1.n_quadrature_points)),
     u2grad(d,std::vector<Tensor<1,dim> >(fev2.n_quadrature_points));
   
-  std::vector<unsigned int> indices1(n1), indices2(n2);
+  std::vector<types::global_dof_index> indices1(n1), indices2(n2);
   for (unsigned int i=0;i<n1;++i) indices1[i] = i;
   for (unsigned int i=0;i<n2;++i) indices2[i] = i;
   
index 32110fa1365e420cb916419884b01fed13399456..af252651dafc708c682e8f005dec61818a927a17 100644 (file)
@@ -76,7 +76,7 @@ int main()
   bi1.push_back(4);
   test(bi1);
   
-  std::vector<unsigned int> v(4);
+  std::vector<types::global_dof_index> v(4);
   for (unsigned int i=0;i<v.size();++i)
     v[i] = 4-i;
   
index 52b40349c9a5688f162d23656334ae47a8eb37b1..398a549f29d537ebeeaa924b8ba38bfa3f88c423 100644 (file)
@@ -158,13 +158,13 @@ void test ()
                                   // and see what we can get after
                                   // vmults:
   BlockVector<double> src;
-  std::vector<unsigned int> src_sizes (2);
+  std::vector<types::global_dof_index> src_sizes (2);
   src_sizes[0] = 10;
   src_sizes[1] = 19;
   src.reinit (src_sizes);
 
   BlockVector<double> dst;
-  std::vector<unsigned int> dst_sizes (3);
+  std::vector<types::global_dof_index> dst_sizes (3);
   dst_sizes[0] = 2;
   dst_sizes[1] = 7;
   dst_sizes[2] = 10;
index f7e0d4b107a0c7346a34db8f4050f82d1af4465d..abbe4294e7bde077f8843439a243ddccb7eb338b 100644 (file)
@@ -32,21 +32,21 @@ int main()
   deallog.threshold_double(1.e-10);
 
   BlockSparsityPattern sparsity;
-  std::vector<unsigned int> row_blocks(4);
+  std::vector<types::global_dof_index> row_blocks(4);
   row_blocks[0] = 4;
   row_blocks[1] = 5;
   row_blocks[2] = 1;
   row_blocks[3] = 4;
-  std::vector<unsigned int> col_blocks(3);
+  std::vector<types::global_dof_index> col_blocks(3);
   col_blocks[0] = 2;
   col_blocks[1] = 3;
   col_blocks[2] = 2;
   BlockIndices rows(row_blocks);
   BlockIndices cols(col_blocks);
 
-  std::vector<std::vector<unsigned int> >
+  std::vector<std::vector<types::global_dof_index> >
     row_length(cols.size(),
-              std::vector<unsigned int>(rows.total_size()));
+              std::vector<types::global_dof_index>(rows.total_size()));
   for (unsigned int jb=0;jb<row_length.size();++jb)
       for (unsigned int i=0;i<row_length[jb].size();++i)
        {
index 7a664882b23be8c6eadbb7f503a0603881d88101..ee4595a7d41cedc6db4101e49fc5fe7dedd00d0d 100644 (file)
@@ -33,12 +33,12 @@ int main()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  std::vector<unsigned int> row_blocks(4);
+  std::vector<types::global_dof_index> row_blocks(4);
   row_blocks[0] = 4;
   row_blocks[1] = 5;
   row_blocks[2] = 1;
   row_blocks[3] = 4;
-  std::vector<unsigned int> col_blocks(3);
+  std::vector<types::global_dof_index> col_blocks(3);
   col_blocks[0] = 2;
   col_blocks[1] = 3;
   col_blocks[2] = 2;
index 97de1ab2008230e5cc6770f40c4d6ca6c7257c63..36fafae3b751bd829522132ec70b05e9a2e364a1 100644 (file)
@@ -26,13 +26,13 @@ void test ()
 {
   deallog.push("BlockIndices");
   
-  std::vector<unsigned int> ivector(4);
+  std::vector<types::global_dof_index> ivector(4);
   ivector[0] = 3;
   ivector[1] = 0;
   ivector[2] = 1;
   ivector[3] = 2;
 
-  const std::vector<unsigned int> vector_indices(ivector);
+  const std::vector<types::global_dof_index> vector_indices(ivector);
   
   BlockIndices i1(ivector);
   BlockIndices i2 = i1;
index 070b34017e525589a51f2efd00bf0f258d66ade1..aec89aa13edd491d67b3ab0f4202ce2f205b31fd 100644 (file)
@@ -27,7 +27,7 @@ void test ()
   for (unsigned int i = 0; i < v.size(); ++i)
     v[i] = double(i+1);
 
-  std::vector<unsigned int>    partition(3);
+  std::vector<types::global_dof_index> partition(3);
   for (unsigned int i = 0; i < partition.size(); ++i)
     partition[i] = 3;
 
index 18b8cba2c5201392ffdbb6411a0a509ed3d06421..cbc68dab037e159ead05458d5f25b2ff9dbd232d 100644 (file)
@@ -38,7 +38,7 @@ bool operator == (const BlockVector<number> &v1,
 
 void test ()
 {
-  std::vector<unsigned int> ivector(4);
+  std::vector<types::global_dof_index> ivector(4);
   ivector[0] = 2;
   ivector[1] = 4;
   ivector[2] = 3;
index 6865ffcbed0203757f1d0b4cd440fa40bf212e35..3ddbdc35940587447106ad79c22b71eaed9081e3 100644 (file)
@@ -39,7 +39,7 @@ bool operator == (const Vector1 &v1,
 
 void test ()
 {
-  std::vector<unsigned int> ivector(4);
+  std::vector<types::global_dof_index> ivector(4);
   ivector[0] = 2;
   ivector[1] = 4;
   ivector[2] = 3;
index 2862227d75bfb76f2e8b0f251958548d1dc046ea..a95c8c89fd34fac5221db7a5b01ba32f4e17218f 100644 (file)
@@ -26,13 +26,13 @@ void test ()
 {
   deallog.push("BlockIndices");
   
-  std::vector<unsigned int> ivector(4);
+  std::vector<types::global_dof_index> ivector(4);
   ivector[0] = 3;
   ivector[1] = 0;
   ivector[2] = 1;
   ivector[3] = 2;
 
-  const std::vector<unsigned int> vector_indices(ivector);
+  const std::vector<types::global_dof_index> vector_indices(ivector);
   
   BlockIndices i1(ivector);
   BlockIndices i2 = i1;
index 0de08c9aedbc1085324500899572ecff7c4d5ee5..797df07e05bafffa8452ff3fcffff7d91fa01e6c 100644 (file)
@@ -38,7 +38,7 @@ bool operator == (const BlockVector<number> &v1,
 
 void test ()
 {
-  std::vector<unsigned int> ivector(4);
+  std::vector<types::global_dof_index> ivector(4);
   ivector[0] = 2;
   ivector[1] = 4;
   ivector[2] = 3;
index 60f001734ee74e5d9ec820c0a8290f317bdb7a6c..da74a7baf23ea00ebab31281ee9737e9b5f91649 100644 (file)
@@ -39,7 +39,7 @@ bool operator == (const Vector1 &v1,
 
 void test ()
 {
-  std::vector<unsigned int> ivector(4);
+  std::vector<types::global_dof_index> ivector(4);
   ivector[0] = 2;
   ivector[1] = 4;
   ivector[2] = 3;
index f0518dc90460a210691d8a8c9138ef6541fb8b92..f1a2b719bd6fbdeb99e5c314fcd36ce56db852a0 100644 (file)
@@ -170,7 +170,7 @@ void do_test (const DoFHandler<dim> &dof,
     const unsigned int   n_q_points    = quadrature_formula.size();
 
     FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     typename DoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active(),
index 6b0fcdd61f7d776b4db325a391d787b742f107dd..a3def4f76d4230a9b429eb92e99bad1c1c676b9f 100644 (file)
@@ -185,7 +185,7 @@ void test ()
 
     FullMatrix<double>   local_matrix (dofs_per_cell, dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     const FEValuesExtractors::Vector sc (0);
 
index aeaa39bcb6cfcf60aa7f48204db7642907e32417..9db01fccc713ac1ff084a56b15d9d77b99d97b1b 100644 (file)
@@ -185,7 +185,7 @@ void test ()
 
     FullMatrix<double>   local_matrix (dofs_per_cell, dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     const FEValuesExtractors::Vector sc (0);
 
index fa7e807efa6a257ee5ff413473b76183cdc3c1d0..f31aeebff0cf75a0c5abb3111498358f0c18704c 100644 (file)
@@ -168,7 +168,7 @@ void test ()
                                     update_values    |  update_gradients |
                                     update_JxW_values);
     FullMatrix<double>   cell_matrix;
-    std::vector<unsigned int> local_dof_indices;
+    std::vector<types::global_dof_index> local_dof_indices;
 
     typename hp::DoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active(),
index e4dbf08f1719f7f679dddcbc74b734419d36fb98..93dff9ad8d7432274335ae88a45c96041b3398a3 100644 (file)
@@ -105,7 +105,7 @@ void test ()
     const unsigned int n_quadrature_points = quad.size();
     const unsigned int dofs_per_cell = fe.dofs_per_cell;
     FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     typename DoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active(),
index da14dd41490bd963443b3655fccadb1470f9a9ee..e201bc83b7fa4ed37daa07684d2ded09c49e336a 100644 (file)
@@ -205,7 +205,7 @@ void test ()
 
     FullMatrix<double>   local_matrix (dofs_per_cell, dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     const FEValuesExtractors::Vector velocities (0);
     const FEValuesExtractors::Scalar pressure (dim);
index 13b369fe3ae797d4bc0bde937576df352b8ed7e3..ae78558ab3e45462a100411b4684585a38ac0ec3 100644 (file)
@@ -213,7 +213,7 @@ void test ()
 
     FullMatrix<double>   local_matrix (dofs_per_cell, dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     const FEValuesExtractors::Vector velocities (0);
     const FEValuesExtractors::Scalar pressure (dim);
index e3fbc8ba2549b83ea21452fa336bcff084aae019..1c8a8298f7bd1698a6206526f28cb21e7c62559f 100644 (file)
@@ -463,7 +463,7 @@ namespace Step37
     const unsigned int   dofs_per_cell = fe.dofs_per_cell;
     const unsigned int   n_q_points    = quadrature_formula.size();
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
     const Coefficient<dim> coefficient;
     std::vector<double>    coefficient_values (n_q_points);
 
@@ -499,7 +499,7 @@ namespace Step37
     const unsigned int   dofs_per_cell = fe.dofs_per_cell;
     const unsigned int   n_q_points    = quadrature_formula.size();
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
     const Coefficient<dim>    coefficient;
     std::vector<double>       coefficient_values (n_q_points);
     FullMatrix<double>        local_matrix (dofs_per_cell, dofs_per_cell);
index 79c00d5063d9a1679ab5ffecfa3c591e39595ebf..05931f575efc033d2df8e04a479720262add7738 100644 (file)
@@ -207,7 +207,7 @@ void test ()
     const unsigned int   n_q_points    = quadrature_formula.size();
 
     FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     typename DoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active(),
index 4e549b746c8604b2b490e970f230773bb09cf53d..cfbc574168257e9437b3fa3fa38e074c08f02bab 100644 (file)
@@ -208,7 +208,7 @@ void test ()
     const unsigned int   n_q_points    = quadrature_formula.size();
 
     FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     typename DoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active(),
index 1432e6d9c3f1ab054b8865c5365aaf6c749ebc2e..0475e44352f474edac5ec63fdfd4f1a5209d393a 100644 (file)
@@ -133,7 +133,7 @@ void test()
   vector.reinit (dofh.locally_owned_dofs(), MPI_COMM_WORLD);
   {
     const unsigned int dofs_per_cell = fe.dofs_per_cell;
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
     Vector<double> local_vector (dofs_per_cell);
     for (unsigned int i=0; i<dofs_per_cell; ++i)
       local_vector(i) = 1.;
index e41f7047d18f4660f3eb77124820a5d320d9d620..d3370390d953de78fa90af6ba3c95926e86c6c0b 100644 (file)
@@ -176,7 +176,7 @@ void test()
   vector.reinit (dofh.locally_owned_dofs(), MPI_COMM_WORLD);
   {
     const unsigned int dofs_per_cell = fe.dofs_per_cell;
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
     Vector<double> local_vector (dofs_per_cell);
     for (unsigned int i=0; i<dofs_per_cell; ++i)
       local_vector(i) = 1.;
index faf49b118f436629c99c4f159eff6a7bc80269cf..b3deca1f419ede6a8f3ac88c0d799cce164e78c6 100644 (file)
@@ -149,7 +149,7 @@ void test()
   vector.reinit (dofh.locally_owned_dofs(), MPI_COMM_WORLD);
   {
     const unsigned int dofs_per_cell = fe.dofs_per_cell;
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
     Vector<double> local_vector (dofs_per_cell);
     for (unsigned int i=0; i<dofs_per_cell; ++i)
       local_vector(i) = 1.;
index a73cdfd12ca676f759bd059dbf3bee83d7b48ddb..f358c039cd5ffbcc97e39bd16802b5394c95cf35 100644 (file)
@@ -81,7 +81,7 @@ void test()
     FEValues<dim> fe_values (fe, quadrature_formula, update_quadrature_points  |
                              update_JxW_values | update_values);
     const unsigned int dofs_per_cell = fe.dofs_per_cell;
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
     Vector<double> local_vector (dofs_per_cell);
     const unsigned int   n_q_points      = quadrature_formula.size();
 
index 1cc055aeb64524e044ff875bd60cf3aead0c65de..e62052b85237d0c97ce3caf2c06d8cb18189e3df 100644 (file)
@@ -88,7 +88,7 @@ void test()
     FEValues<dim> fe_values (fe, quadrature_formula, update_quadrature_points  |
                              update_JxW_values | update_values);
     const unsigned int dofs_per_cell = fe.dofs_per_cell;
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
     Vector<double> local_vector (dofs_per_cell);
     const unsigned int   n_q_points      = quadrature_formula.size();
 
index 5bbf71aaaa05ef365f9065d98c450050d52085cb..745fc51bfffe8a665799fe02ab95e7e0cfab57a6 100644 (file)
@@ -184,7 +184,7 @@ namespace Step40
     FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
     Vector<double>       cell_rhs (dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     typename DoFHandler<dim>::active_cell_iterator
       cell = dof_handler.begin_active(),
index e0293e5b1e9769d145791345bad3abeb82941b4a..0fda23bc8565c644d6ab32a78b70f60b3f2523cd 100644 (file)
@@ -184,7 +184,7 @@ namespace Step40
     FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
     Vector<double>       cell_rhs (dofs_per_cell);
 
-    std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+    std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
     typename DoFHandler<dim>::active_cell_iterator
       cell = dof_handler.begin_active(),
index 1d08c819f5451b432411c73425ed7d0b3de0fe32..ef529056a781dcdd7b2d1e87806975d5f6af9136 100644 (file)
 
 using namespace std;
 
-void log_vector (const std::vector<std::set<unsigned int> >& count)
+void log_vector (const std::vector<std::set<types::global_dof_index> >& count)
 {
   for (unsigned int l=0;l<count.size();++l)
     {
       deallog << "Level " << l << ':';
-      for (std::set<unsigned int>::const_iterator c=count[l].begin();
+      for (std::set<types::global_dof_index>::const_iterator c=count[l].begin();
           c != count[l].end();++c)
        deallog << ' ' << *c;
       deallog << std::endl;
@@ -66,7 +66,7 @@ void check_fe(FiniteElement<dim>& fe)
   MGDoFHandler<dim> mgdof(tr);
   mgdof.distribute_dofs(fe);
   
-  std::vector<std::set<unsigned int> > boundary_indices(tr.n_levels());
+  std::vector<std::set<types::global_dof_index> > boundary_indices(tr.n_levels());
   MGTools::make_boundary_list(mgdof, fmap, boundary_indices);
   log_vector(boundary_indices);
 }
index cbb01a92728b0e717ca6bfb7763d7c0095c6f5cb..ac5a49e6622821b98b3d889f7de279611cf11114 100644 (file)
@@ -35,7 +35,7 @@
 
 using namespace std;
 
-void log_vector (const std::vector<std::vector<unsigned int> >& count)
+void log_vector (const std::vector<std::vector<types::global_dof_index> >& count)
 {
   for (unsigned int l=0;l<count.size();++l)
     {
@@ -61,7 +61,7 @@ void check_fe(FiniteElement<dim>& fe)
   MGDoFHandler<dim> mgdof(tr);
   mgdof.distribute_dofs(fe);
   
-  std::vector<std::vector<unsigned int> > count(tr.n_levels());
+  std::vector<std::vector<types::global_dof_index> > count(tr.n_levels());
   MGTools::count_dofs_per_component(mgdof, count, false);
   log_vector(count);
   MGTools::count_dofs_per_component(mgdof, count, true);
index 5353f1515ac6e520237be0ddc026c8bfd222fd88..c9f09cd31cf4112aea88ecd84bef474001b2a7b2 100644 (file)
@@ -45,7 +45,7 @@ void dofs(const MGDoFHandler<dim>& dof)
   typename MGDoFHandler<dim>::cell_iterator cell;
   const typename MGDoFHandler<dim>::cell_iterator end = dof.end();
 
-  std::vector<unsigned int> indices;
+  std::vector<types::global_dof_index> indices;
   
   for (cell = dof.begin(); cell != end; ++cell)
     {
index d81631f2e2b6722ef6cb36e47f67c1fb0132769f..50e0a663121887ecc411911fff4397a0fcdef185 100644 (file)
@@ -45,7 +45,7 @@ void dofs(const MGDoFHandler<dim>& dof)
   typename MGDoFHandler<dim>::cell_iterator cell;
   const typename MGDoFHandler<dim>::cell_iterator end = dof.end();
 
-  std::vector<unsigned int> indices;
+  std::vector<types::global_dof_index> indices;
   
   for (cell = dof.begin(); cell != end; ++cell)
     {
index 1aa5a40c10157b4bd75255f73c200cb708d380d7..d528848a56cfa5484e12ffae8220fe464f0b5099 100644 (file)
@@ -99,7 +99,7 @@ void initialize (const MGDoFHandler<dim> &dof,
 {
   unsigned int counter=0;
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   for (typename MGDoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active();
       cell != dof.end(); ++cell)
@@ -116,8 +116,8 @@ void initialize (const MGDoFHandler<dim> &dof,
 {
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
   const unsigned int dofs_per_face = dof.get_fe().dofs_per_face;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
-  std::vector<unsigned int> face_indices(dofs_per_face);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> face_indices(dofs_per_face);
 
   for(unsigned int l=0; l<dof.get_tria().n_levels(); ++l)
   {
@@ -150,7 +150,7 @@ void print (const MGDoFHandler<dim> &dof,
     MGLevelObject<Vector<double> > &u)
 {
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   for(unsigned int l=0; l<dof.get_tria().n_levels(); ++l)
   {
     deallog << std::endl;
@@ -173,8 +173,8 @@ void print_diff (const MGDoFHandler<dim> &dof_1, const MGDoFHandler<dim> &dof_2,
   Vector<double> diff;
   diff.reinit (u);
   const unsigned int dofs_per_cell = dof_1.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices_1(dofs_per_cell);
-  std::vector<unsigned int> dof_indices_2(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices_1(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices_2(dofs_per_cell);
   for (typename MGDoFHandler<dim>::active_cell_iterator
       cell_1 = dof_1.begin_active(), cell_2 = dof_2.begin_active();
       cell_1 != dof_1.end(); ++cell_1, ++cell_2)
index e35e9cb19b4b21fba6e9ac3865b317c0a38724d7..31eead6035e7c569f79c0567a7c37428050aae4c 100644 (file)
@@ -78,7 +78,7 @@ void initialize (const MGDoFHandler<dim> &dof,
 {
   unsigned int counter=0;
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   for (typename MGDoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active();
       cell != dof.end(); ++cell)
@@ -113,8 +113,8 @@ void print_diff (const MGDoFHandler<dim> &dof_1, const MGDoFHandler<dim> &dof_2,
   Vector<double> diff;
   diff.reinit (u);
   const unsigned int dofs_per_cell = dof_1.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices_1(dofs_per_cell);
-  std::vector<unsigned int> dof_indices_2(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices_1(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices_2(dofs_per_cell);
   for (typename MGDoFHandler<dim>::active_cell_iterator
       cell_1 = dof_1.begin_active(), cell_2 = dof_2.begin_active();
       cell_1 != dof_1.end(); ++cell_1, ++cell_2)
index 971cda159b1590209b62f6bc38e8188ab7eded4a..8655bb729cc4cb4abad477f91bd66b842e0ee725 100644 (file)
@@ -69,7 +69,7 @@ void initialize (const MGDoFHandler<dim> &dof,
     Vector<double> &u)
 {
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   for (typename MGDoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active();
       cell != dof.end(); ++cell)
@@ -90,7 +90,7 @@ void initialize (const MGDoFHandler<dim> &dof,
 {
   unsigned int counter=0;
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   typename MGDoFHandler<dim>::cell_iterator
       cell = dof.begin(0);
     cell->get_mg_dof_indices(dof_indices);
@@ -179,7 +179,7 @@ class LaplaceProblem
     MGDoFHandler<dim>    mg_dof_handler_renumbered;
 
     const unsigned int degree;
-    std::vector<std::set<unsigned int> >
+    std::vector<std::set<types::global_dof_index> >
       boundary_indices_renumbered;
 
 };
@@ -273,7 +273,7 @@ void LaplaceProblem<dim>::test_boundary ()
     u[l].reinit(mg_dof_handler_renumbered.n_dofs(l));
     u[l] = 1.;
 
-    for(std::set<unsigned int>::const_iterator i = boundary_indices_renumbered[l].begin();
+    for(std::set<types::global_dof_index>::const_iterator i = boundary_indices_renumbered[l].begin();
       i!=boundary_indices_renumbered[l].end(); ++i)
     {
       u[l](*i) = 0;
index 59d001f6149bcabe05aeb41a1af3ba70f641a681..1f9d489cafd41b129c8d690aa335ffe337479d97 100644 (file)
@@ -69,7 +69,7 @@ void initialize (const MGDoFHandler<dim> &dof,
     Vector<double> &u)
 {
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   for (typename MGDoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active();
       cell != dof.end(); ++cell)
@@ -91,7 +91,7 @@ void initialize (const MGDoFHandler<dim> &dof,
 {
   unsigned int counter=0;
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   typename MGDoFHandler<dim>::cell_iterator
       cell = dof.begin(0);
     cell->get_mg_dof_indices(dof_indices);
@@ -106,7 +106,7 @@ void diff (Vector<double> &diff, const MGDoFHandler<dim> &dof,
 {
   diff.reinit (v);
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> mg_dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> mg_dof_indices(dofs_per_cell);
   const unsigned int n_comp = dof.get_fe().n_components();
   for (typename MGDoFHandler<dim>::cell_iterator
       cell= dof.begin(level);
@@ -149,7 +149,7 @@ template <int dim>
 void print(const MGDoFHandler<dim> &dof, std::vector<std::vector<bool> > &interface_dofs)
 {
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   for(unsigned int l=0; l<dof.get_tria().n_levels(); ++l)
   {
     deallog << std::endl;
index 052f846f0fb512c423f8bf32643b5a346f341653..8e68d43d8c432d874e5ba670651c487b0ac8471e 100644 (file)
@@ -54,7 +54,7 @@ void check()
     cell = mgdof.begin(),
     endc = mgdof.end();
   std::vector<types::global_dof_index> local_dof_indices (fe.dofs_per_cell);
-  std::vector<unsigned int> mg_dof_indices (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> mg_dof_indices (fe.dofs_per_cell);
   for (; cell!=endc; ++cell)
     {
       if (!cell->has_children())
index 3aff3d4cd5e9336227cff3fbc2255353cc3cf4c6..ffef2e913cfb681e6f0bfbdb43c9cf586f779265 100644 (file)
@@ -56,8 +56,8 @@ void check()
   mg_dof_handler.distribute_dofs(fe);
   for (unsigned int level=0; level<tria.n_levels(); ++level)
     {
-      const unsigned int n_dofs=mg_dof_handler.n_dofs(level);
-      vector<unsigned int> new_numbers(n_dofs);
+      const types::global_dof_index n_dofs=mg_dof_handler.n_dofs(level);
+      vector<types::global_dof_index> new_numbers(n_dofs);
       for (unsigned int i=0; i<n_dofs; ++i)
        new_numbers[i]=n_dofs-1-i;
 
index c4f80d7e0659779f886b83040faf037a12df5f40..e0e41819ad13449da8440844ecb14ea834cd421a 100644 (file)
@@ -98,7 +98,7 @@ void initialize (const MGDoFHandler<dim> &dof,
 {
   unsigned int counter=0;
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   for (typename MGDoFHandler<dim>::active_cell_iterator
       cell = dof.begin_active();
       cell != dof.end(); ++cell)
@@ -115,7 +115,7 @@ void initialize (const MGDoFHandler<dim> &dof,
 {
   unsigned int counter=0;
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   typename MGDoFHandler<dim>::cell_iterator
       cell = dof.begin(0);
     cell->get_mg_dof_indices(dof_indices);
@@ -128,7 +128,7 @@ void print (const MGDoFHandler<dim> &dof,
     MGLevelObject<Vector<double> > &u)
 {
   const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices(dofs_per_cell);
   for(unsigned int l=0; l<dof.get_tria().n_levels(); ++l)
   {
     deallog << std::endl;
@@ -151,8 +151,8 @@ void print_diff (const MGDoFHandler<dim> &dof_1, const MGDoFHandler<dim> &dof_2,
   Vector<double> diff;
   diff.reinit (u);
   const unsigned int dofs_per_cell = dof_1.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dof_indices_1(dofs_per_cell);
-  std::vector<unsigned int> dof_indices_2(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices_1(dofs_per_cell);
+  std::vector<types::global_dof_index> dof_indices_2(dofs_per_cell);
   for (typename MGDoFHandler<dim>::active_cell_iterator
       cell_1 = dof_1.begin_active(), cell_2 = dof_2.begin_active();
       cell_1 != dof_1.end(); ++cell_1, ++cell_2)
index 058df01d6323752180f96a8934268914f370f37d..cd0f35f2201910d7422e2e26fd7069b8293bf0fd 100644 (file)
@@ -44,7 +44,7 @@ reinit_vector_by_blocks (
   const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
   MGLevelObject<BlockVector<number> > &v,
   const std::vector<bool> &sel,
-  std::vector<std::vector<unsigned int> >& ndofs)
+  std::vector<std::vector<types::global_dof_index> >& ndofs)
 {
   std::vector<bool> selected=sel;
                                   // Compute the number of blocks needed
@@ -55,9 +55,9 @@ reinit_vector_by_blocks (
 
   if (ndofs.size() == 0)
     {
-      std::vector<std::vector<unsigned int> >
+      std::vector<std::vector<types::global_dof_index> >
        new_dofs(mg_dof.get_tria().n_levels(),
-                std::vector<unsigned int>(selected.size()));
+                std::vector<types::global_dof_index>(selected.size()));
       std::swap(ndofs, new_dofs);
       MGTools::count_dofs_per_block (mg_dof, ndofs);
     }
@@ -97,13 +97,13 @@ void check_block(const FiniteElement<dim>& fe,
   DoFHandler<dim>& dof=mgdof;
   mgdof.distribute_dofs(fe);
   DoFRenumbering::component_wise(mgdof);
-  vector<unsigned int> ndofs(fe.n_blocks());
+  vector<types::global_dof_index> ndofs(fe.n_blocks());
   DoFTools::count_dofs_per_block(mgdof, ndofs);
 
   for (unsigned int l=0;l<tr.n_levels();++l)
     DoFRenumbering::component_wise(mgdof, l);
-  std::vector<std::vector<unsigned int> > mg_ndofs(mgdof.get_tria().n_levels(),
-                                                  std::vector<unsigned int>(fe.n_blocks()));
+  std::vector<std::vector<types::global_dof_index> > mg_ndofs(mgdof.get_tria().n_levels(),
+                                                  std::vector<types::global_dof_index>(fe.n_blocks()));
   MGTools::count_dofs_per_block(mgdof, mg_ndofs);
 
   deallog << "Global  dofs:";
index 733f91a6bd3b8344aa10b69ccd3e632e9f6fb403..69190642153fc96badff24a959f6188dabebe437 100644 (file)
@@ -44,7 +44,7 @@ reinit_vector_by_blocks (
   const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
   MGLevelObject<dealii::Vector<number> > &v,
   const unsigned int selected_block,
-  std::vector<std::vector<unsigned int> >& ndofs)
+  std::vector<std::vector<types::global_dof_index> >& ndofs)
 {
   const unsigned int n_blocks = mg_dof.get_fe().n_blocks();
   Assert(selected_block < n_blocks, ExcIndexRange(selected_block, 0, n_blocks));
@@ -54,9 +54,9 @@ reinit_vector_by_blocks (
 
   if (ndofs.size() == 0)
     {
-      std::vector<std::vector<unsigned int> >
+      std::vector<std::vector<types::global_dof_index> >
        new_dofs(mg_dof.get_tria().n_levels(),
-                std::vector<unsigned int>(selected.size()));
+                std::vector<types::global_dof_index>(selected.size()));
       std::swap(ndofs, new_dofs);
       MGTools::count_dofs_per_block (mg_dof, ndofs);
     }
@@ -83,13 +83,13 @@ void check_select(const FiniteElement<dim>& fe, unsigned int selected)
   DoFHandler<dim>& dof=mgdof;
   mgdof.distribute_dofs(fe);
   DoFRenumbering::component_wise(mgdof);
-  vector<unsigned int> ndofs(fe.n_blocks());
+  vector<types::global_dof_index> ndofs(fe.n_blocks());
   DoFTools::count_dofs_per_block(mgdof, ndofs);
 
   for (unsigned int l=0;l<tr.n_levels();++l)
     DoFRenumbering::component_wise(mgdof, l);
-  std::vector<std::vector<unsigned int> > mg_ndofs(mgdof.get_tria().n_levels(),
-                                                  std::vector<unsigned int>(fe.n_blocks()));
+  std::vector<std::vector<types::global_dof_index> > mg_ndofs(mgdof.get_tria().n_levels(),
+                                                  std::vector<types::global_dof_index>(fe.n_blocks()));
   MGTools::count_dofs_per_block(mgdof, mg_ndofs);
 
   deallog << "Global  dofs:";
index efdfc7819885d6289330b59feb32dab313f38069..e70b350c8c46ce75b7b6281b0a9760ad40948e3e 100644 (file)
@@ -47,7 +47,7 @@ reinit_vector_by_blocks (
   const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
   MGLevelObject<dealii::Vector<number> > &v,
   const unsigned int selected_block,
-  std::vector<std::vector<unsigned int> >& ndofs)
+  std::vector<std::vector<types::global_dof_index> >& ndofs)
 {
   const unsigned int n_blocks = mg_dof.get_fe().n_blocks();
   Assert(selected_block < n_blocks, ExcIndexRange(selected_block, 0, n_blocks));
@@ -57,7 +57,7 @@ reinit_vector_by_blocks (
 
   if (ndofs.size() == 0)
     {
-      std::vector<std::vector<unsigned int> >
+      std::vector<std::vector<types::global_dof_index> >
        new_dofs(mg_dof.get_tria().n_levels(),
                 std::vector<unsigned int>(selected.size()));
       std::swap(ndofs, new_dofs);
@@ -78,7 +78,7 @@ reinit_vector_by_blocks (
   const dealii::MGDoFHandler<dim,spacedim> &mg_dof,
   MGLevelObject<BlockVector<number> > &v,
   const std::vector<bool> &sel,
-  std::vector<std::vector<unsigned int> >& ndofs)
+  std::vector<std::vector<types::global_dof_index> >& ndofs)
 {
   std::vector<bool> selected=sel;
                                   // Compute the number of blocks needed
@@ -89,9 +89,9 @@ reinit_vector_by_blocks (
 
   if (ndofs.size() == 0)
     {
-      std::vector<std::vector<unsigned int> >
+      std::vector<std::vector<types::global_dof_index> >
        new_dofs(mg_dof.get_tria().n_levels(),
-                std::vector<unsigned int>(selected.size()));
+                std::vector<types::global_dof_index>(selected.size()));
       std::swap(ndofs, new_dofs);
       MGTools::count_dofs_per_block (mg_dof, ndofs);
     }
@@ -143,10 +143,10 @@ void check_block(const FiniteElement<dim>& fe)
     }
 
                                   // Store sizes
-  vector<unsigned int> ndofs(fe.n_blocks());
+  vector<types::global_dof_index> ndofs(fe.n_blocks());
   DoFTools::count_dofs_per_block(mgdof, ndofs);
-  std::vector<std::vector<unsigned int> > mg_ndofs(mgdof.get_tria().n_levels(),
-                                                  std::vector<unsigned int>(fe.n_blocks()));
+  std::vector<std::vector<types::global_dof_index> > mg_ndofs(mgdof.get_tria().n_levels(),
+                                                  std::vector<types::global_dof_index>(fe.n_blocks()));
   MGTools::count_dofs_per_block(mgdof, mg_ndofs);
 
   MGTransferPrebuilt<BlockVector<double> > transfer;
@@ -224,7 +224,7 @@ void check_block(const FiniteElement<dim>& fe)
   for (unsigned int i=0;i<u.size();++i)
     u(i) = i+1;
 
-  std::vector<std::vector<unsigned int> > cached_sizes;
+  std::vector<std::vector<types::global_dof_index> > cached_sizes;
   MGLevelObject<BlockVector<double> > v;
   MGLevelObject<BlockVector<double> > wb;
   MGLevelObject<Vector<double> > ws;
index ad4bba7a32aa915346c879b07dd485cdb54380e0..ccbe746cf9772e40df4ef1e85d364c4749aa9e4f 100644 (file)
@@ -57,14 +57,14 @@ void check_select(const FiniteElement<dim>& fe,
   mgdof.distribute_dofs(fe);
   DoFRenumbering::component_wise(static_cast<DoFHandler<dim>&>(mgdof),
                                  target_component);
-  vector<unsigned int> ndofs(*std::max_element (target_component.begin(),
+  vector<types::global_dof_index> ndofs(*std::max_element (target_component.begin(),
                                                target_component.end()) + 1);
   DoFTools::count_dofs_per_component(dof, ndofs, true, target_component);
   
   for (unsigned int l=0;l<tr.n_levels();++l)
     DoFRenumbering::component_wise(mgdof, l, mg_target_component);
 
-  std::vector<std::vector<unsigned int> > mg_ndofs(mgdof.get_tria().n_levels());
+  std::vector<std::vector<types::global_dof_index> > mg_ndofs(mgdof.get_tria().n_levels());
   MGTools::count_dofs_per_component(mgdof, mg_ndofs, true, mg_target_component);
 
   deallog << "Global  dofs:";
index 3e8b199682fe322c2127b856a81eeb70f7146c59..8036c17705462f040ad1421ee9d8f2dc5711f065 100644 (file)
@@ -157,7 +157,7 @@ void test ()
   assemble_laplace(Bb, bb, dof_handler, fe);
   assemble_laplace(B, b, dof_handler, fe);
   
-  std::map<unsigned int,double> boundary_values;
+  std::map<types::global_dof_index,double> boundary_values;
   VectorTools::interpolate_boundary_values (dof_handler,
                                             0,
                                             ZeroFunction<dim>(size.size()),

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.