]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Convert unsigned int to types::global_dof_index in the tests.
authorBruno Turcksin <bruno.turcksin@gmail.com>
Wed, 20 Mar 2013 19:54:19 +0000 (19:54 +0000)
committerBruno Turcksin <bruno.turcksin@gmail.com>
Wed, 20 Mar 2013 19:54:19 +0000 (19:54 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28961 0785d39b-7218-0410-832d-ea1e28bc413d

101 files changed:
tests/bits/count_dofs_per_block_01.cc
tests/bits/count_dofs_per_block_02.cc
tests/bits/count_dofs_per_component_hp_02.cc
tests/bits/dof_constraints_01.cc
tests/bits/dof_constraints_02.cc
tests/bits/dof_constraints_07.cc
tests/bits/dof_constraints_08.cc
tests/bits/dof_constraints_09.cc
tests/bits/dof_tools_00a.cc
tests/bits/dof_tools_01c.cc
tests/bits/dof_tools_01d.cc
tests/bits/dof_tools_01d_x.cc
tests/bits/dof_tools_02c.cc
tests/bits/dof_tools_02d.cc
tests/bits/dof_tools_02d_x.cc
tests/bits/dof_tools_07.cc
tests/bits/dof_tools_08.cc
tests/bits/dof_tools_09.cc
tests/bits/dof_tools_11.cc
tests/bits/dof_tools_15a.cc
tests/bits/dof_tools_15b.cc
tests/bits/dof_tools_15b_x.cc
tests/bits/dof_tools_15c.cc
tests/bits/dof_tools_15d.cc
tests/bits/dof_tools_15d_x.cc
tests/bits/dof_tools_16a.cc
tests/bits/dof_tools_16b.cc
tests/bits/dof_tools_16b_x.cc
tests/bits/dof_tools_16c.cc
tests/bits/dof_tools_16d.cc
tests/bits/dof_tools_16d_x.cc
tests/bits/dof_tools_17c.cc
tests/bits/dof_tools_17d.cc
tests/bits/dof_tools_17d_x.cc
tests/bits/dof_tools_18c.cc
tests/bits/dof_tools_18d.cc
tests/bits/dof_tools_18d_x.cc
tests/bits/dof_tools_21_b.cc
tests/bits/fe_tools_common.h
tests/bits/gerold_2.cc
tests/bits/make_boundary_constraints_01.cc
tests/bits/make_boundary_constraints_02.cc
tests/bits/sparse_matrix_add_entries_01.cc
tests/bits/sparse_matrix_add_entries_02.cc
tests/bits/sparse_matrix_add_entries_03.cc
tests/bits/sparse_matrix_add_entries_04.cc
tests/bits/sparse_matrix_add_entries_05.cc
tests/bits/sparse_matrix_add_entries_06.cc
tests/bits/step-12.cc
tests/bits/subdomain_ids_03.cc
tests/codim_one/interpolate_boundary_values_02.cc
tests/codim_one/interpolate_boundary_values_1d_closed_ring.cc
tests/deal.II/dof_renumbering.cc
tests/deal.II/dof_renumbering_04a.cc
tests/deal.II/extract_dofs_by_component_06_hp.cc
tests/deal.II/fe_values_view_22.cc
tests/deal.II/filtered_matrix.cc
tests/deal.II/grid_transform_3d.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_01.cc
tests/deal.II/matrices.cc
tests/deal.II/project_boundary_rt_01.cc
tests/deal.II/sparsity_pattern.cc
tests/deal.II/sparsity_pattern_01.cc
tests/deal.II/sparsity_pattern_01_x.cc
tests/deal.II/sparsity_pattern_x.cc
tests/deal.II/vertex_as_face_06.cc
tests/deal.II/vertex_as_face_07.cc
tests/distributed_grids/count_dofs_per_component_01.cc
tests/hp/fe_nothing_09.cc
tests/hp/renumber_block_wise_01a.cc
tests/hp/step-12.cc
tests/lac/full_matrix_05.cc
tests/lac/solver.cc
tests/lac/solver_relaxation_03.cc
tests/lac/sparsity_pattern.cc
tests/lac/sparsity_tools_01.cc
tests/matrix_free/step-37.cc
tests/mpi/count_dofs_per_block_01.cc
tests/mpi/map_dofs_to_support_points.cc
tests/mpi/p4est_2d_dofhandler_04.cc
tests/mpi/petsc_01.cc
tests/mpi/petsc_02.cc
tests/mpi/trilinos_compress_bug.cc
tests/petsc/block_vector_iterator_03.cc
tests/serialization/dof_handler_01.cc
tests/trilinos/49a.cc
tests/trilinos/49b.cc
tests/trilinos/52.cc
tests/trilinos/67.cc
tests/trilinos/69.cc
tests/trilinos/block_sparse_matrix_add_01.cc
tests/trilinos/block_sparse_matrix_set_01.cc
tests/trilinos/block_vector_iterator_03.cc
tests/trilinos/sparse_matrix_add_01.cc
tests/trilinos/sparse_matrix_add_02.cc
tests/trilinos/sparse_matrix_set_01.cc
tests/trilinos/sparse_matrix_set_02.cc
tests/umfpack/umfpack_04.cc

index 358308d8d699bf13071017cd5c70a06ac423dbb1..1fcaa0452f647176cafd0eb58ff966bed8329efd 100644 (file)
@@ -42,7 +42,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)
index fab2b1f1120093d692fb898a7d90bebae74fd810..1cd466e02ceed5d174ca0fd7df3551148f784312 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)
index 78a482695575ea3a609ec459f72bb635c30e0404..42565bec6e05049dc87ac958d64b83993daa7019 100644 (file)
@@ -60,7 +60,7 @@ void test ()
   hp_dof_handler.distribute_dofs(fe_collection);
 
   //count dofs per component and show them on the screen
-  std::vector<unsigned int> dofs_per_component_hp(3,0);
+  std::vector<types::global_dof_index> dofs_per_component_hp(3,0);
   DoFTools::count_dofs_per_component(hp_dof_handler, dofs_per_component_hp);
 
   for (unsigned int i=0; i<3; i++)
index bef2390654611c62370fedbc456879c374e61acb..7e2cdbcaca115b6695385f3c2801001871ea7250 100644 (file)
@@ -81,7 +81,7 @@ void test ()
                                    // them into the matrix and condensing away
                                    // hanging node constraints later on, or
                                    // (2) distributing them right away
-  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);
   for (typename DoFHandler<dim>::active_cell_iterator
          cell = dof_handler.begin_active();
index 42774dc596a29cba2f7293917cc2c85400e1c5b1..2c83343e888838caff76da0b3b607f939ef14143 100644 (file)
@@ -74,7 +74,7 @@ void test ()
                                    // them into the vector and condensing away
                                    // hanging node constraints later on, or
                                    // (2) distributing them right away
-  std::vector<unsigned int> local_dofs (fe.dofs_per_cell);
+  std::vector<types::global_dof_index> local_dofs (fe.dofs_per_cell);
   Vector<double> local_vector (fe.dofs_per_cell);
   for (typename DoFHandler<dim>::active_cell_iterator
          cell = dof_handler.begin_active();
index 7cd345edb102202c66046336ee6f8825ec7022c9..cd98abc71577383b22bb29ef05f0e8c4542bf4ea 100644 (file)
@@ -61,7 +61,7 @@ void test ()
   constraints.close ();
   deallog << "Number of constraints: " << constraints.n_constraints() << std::endl;
 
-  std::vector<unsigned int> block_sizes(2);
+  std::vector<types::global_dof_index> block_sizes(2);
   block_sizes[0] = dof_handler.n_dofs()/3;
   block_sizes[1] = dof_handler.n_dofs() - block_sizes[0];
   BlockVector<double> b(block_sizes);
index db2b6090ef5a2bb57925d42b639aeeebf24df803..1124c09ca0b7142ab09715851594de5c74faa697 100644 (file)
@@ -61,7 +61,7 @@ void test ()
   constraints.close ();
   deallog << "Number of constraints: " << constraints.n_constraints() << std::endl;
 
-  std::vector<unsigned int> block_sizes(2);
+  std::vector<types::global_dof_index> block_sizes(2);
   block_sizes[0] = dof_handler.n_dofs()/3;
   block_sizes[1] = dof_handler.n_dofs() - block_sizes[0];
   BlockVector<double> b(block_sizes);
index 2fd5782fde1c5f28b55d4bf49f87ca42a326d6b4..26d39aef70087321a7b99e939c29dfaf2c150ed0 100644 (file)
@@ -81,7 +81,7 @@ void test ()
 
                                    // then fill the matrix by setting up
                                    // bogus matrix entries
-  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);
   for (typename DoFHandler<dim>::active_cell_iterator
          cell = dof_handler.begin_active();
index 3998f0eb6c66a275ad9d82cb1c9c01057de99b44..26e8d09cbb3df2911b903a4405adafb45ffeaaa4 100644 (file)
@@ -29,7 +29,7 @@ check_this (const DoFHandler<dim> &dof_handler)
 
   deallog << "n_dofs:" << dof_handler.n_dofs() << std::endl;
   
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                      dofs_per_component);
 
index e80558bbc1749e0a2e119764c2b6052ab385be28..78b4d2f4ac88845de3a925f04c5846de3107deac 100644 (file)
@@ -40,7 +40,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockSparsityPattern sp (n_components,
                            n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index fcc089c208257ec63d9615ddf3dd3b0e82431027..650d3a4e41963c19f710041fed900b62e3dc7b94 100644 (file)
@@ -40,7 +40,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockCompressedSparsityPattern sp (n_components,
                                      n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index 5e8819fa31c8301f86057fa0198d097e6d07d908..80d37996dd4364cebed32b4dd5fb12ebb8ec8098 100644 (file)
@@ -40,7 +40,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockCompressedSetSparsityPattern sp (n_components,
                                      n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index 99e5991a2e162963ef8b771298188ca1aa8c03e8..b931917579c517811bb2a4c507b3739ca983a822 100644 (file)
@@ -47,7 +47,7 @@ check_this (const DoFHandler<dim> &dof_handler)
                                    // create sparsity pattern
   BlockSparsityPattern sp (n_components,
                            n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index bb4a87e585f9034232c090a79637c2b439046f13..0510940f142f4a373550d7967b64bc8c4b5fe2d4 100644 (file)
@@ -47,7 +47,7 @@ check_this (const DoFHandler<dim> &dof_handler)
                                    // create sparsity pattern
   BlockCompressedSparsityPattern sp (n_components,
                                      n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_inde> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index cf6d862b1ad8768d3cc46fb04a241118ccf44dc1..9e65db6548154ffa63e76b72d6a468cbcc445db1 100644 (file)
@@ -47,7 +47,7 @@ check_this (const DoFHandler<dim> &dof_handler)
                                    // create sparsity pattern
   BlockCompressedSetSparsityPattern sp (n_components,
                                      n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index 0b6392252fc9756e245f676ec9654360abc44a01..280d2854a4f2523abed086ba6a990c477f77f9e3 100644 (file)
@@ -25,7 +25,7 @@ template <int dim>
 void
 check_this (const DoFHandler<dim> &dof_handler)
 {
-  std::vector<unsigned int> n_dofs(dof_handler.get_fe().n_components());
+  std::vector<types::global_dof_index> n_dofs(dof_handler.get_fe().n_components());
   DoFTools::count_dofs_per_component (dof_handler,
                                       n_dofs);
   for (unsigned int i=0; i<n_dofs.size(); ++i)
index 4ae17eb7b4df8dee16e4bd04a3118751abd0d763..5374d8a830a74f7b43beb382dd445e6de9620bff 100644 (file)
@@ -26,7 +26,7 @@ template <int dim>
 void
 check_this (const DoFHandler<dim> &dof_handler)
 {
-  std::vector<unsigned int> map(dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map(dof_handler.n_dofs());
   DoFTools::map_dof_to_boundary_indices (dof_handler, map);
   for (unsigned int i=0; i<map.size(); ++i)
     deallog << map[i] << " ";
index 11552d6bde166683b6352534c06e4194b0a0efd5..ea96073aad066c552c2b24b5dd3d8456a10b0a6b 100644 (file)
@@ -27,7 +27,7 @@ template <int dim>
 void
 check_this (const DoFHandler<dim> &dof_handler)
 {
-  std::vector<unsigned int> map(dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map(dof_handler.n_dofs());
   std::set<types::boundary_id> boundary_ids;
 
                                    // check for boundary id 0 alone
index 5b6a51d8e7cf0ad2ef02179d6ae4ebfb924a5988..8488e3f9d8e922a29bf418ccd68e9d69a2dfaa85 100644 (file)
@@ -48,7 +48,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().get_unit_support_points().size() == 0)
     return;
 
-  std::map<Point<dim>, unsigned int, Comp> map;
+  std::map<Point<dim>, types::global_dof_index, Comp> map;
   MappingQ<dim> mapping(2);
 
   DoFTools::map_support_points_to_dofs (mapping, dof_handler, map);
index 7527e67d66e08c4d2b8ff70f75de72d7513f3883..424332224c7ba834078ab695ff2d58626b45226b 100644 (file)
@@ -34,7 +34,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   DoFTools::map_dof_to_boundary_indices (dof_handler, map);
   
                                    // create sparsity pattern
index 71b7b74d84b9e05d7cf4151f504cc50e7ad95d40..184955bae77759c409ea118b15470a6b314a6039 100644 (file)
@@ -33,7 +33,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   DoFTools::map_dof_to_boundary_indices (dof_handler, map);
   
                                    // create sparsity pattern
index f2e9ecbb02f8de8e14d841197743eee6d3846072..aac650423152e75fc7cd885240e70801d75adba3 100644 (file)
@@ -33,7 +33,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   DoFTools::map_dof_to_boundary_indices (dof_handler, map);
   
                                    // create sparsity pattern
index 17a57a16e8631e1b2632355288bee3da2b7067c5..62ddd7b23ee8a9f3738002a1c47e0b3c4f35bced 100644 (file)
@@ -33,7 +33,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   DoFTools::map_dof_to_boundary_indices (dof_handler, map);
   
   const unsigned int n_blocks = std::min (dof_handler.get_fe().n_components(),
@@ -42,7 +42,7 @@ check_this (const DoFHandler<dim> &dof_handler)
                            n_blocks);
                                    // split dofs almost arbitrarily to
                                    // blocks
-  std::vector<unsigned int> dofs_per_block(n_blocks);
+  std::vector<types::global_dof_index> dofs_per_block(n_blocks);
   for (unsigned int i=0; i<n_blocks-1; ++i)
     dofs_per_block[i] = dof_handler.n_boundary_dofs()/n_blocks;
   dofs_per_block.back() = (dof_handler.n_boundary_dofs() -
index 2c3a410d3985871c3258f2d3b44b783ec9357144..8ada4c4bec7ed6885f3f0163d79c9012ee6e2d8b 100644 (file)
@@ -33,7 +33,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   DoFTools::map_dof_to_boundary_indices (dof_handler, map);
   
   const unsigned int n_blocks = std::min (dof_handler.get_fe().n_components(),
index 70bc8a36e833706664581823fb2eb8d525e3ebed..db4cb9def42aab400981bd659415c985893df508 100644 (file)
@@ -33,7 +33,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   DoFTools::map_dof_to_boundary_indices (dof_handler, map);
   
   const unsigned int n_blocks = std::min (dof_handler.get_fe().n_components(),
@@ -42,7 +42,7 @@ check_this (const DoFHandler<dim> &dof_handler)
                                      n_blocks);
                                    // split dofs almost arbitrarily to
                                    // blocks
-  std::vector<unsigned int> dofs_per_block(n_blocks);
+  std::vector<types::global_dof_index> dofs_per_block(n_blocks);
   for (unsigned int i=0; i<n_blocks-1; ++i)
     dofs_per_block[i] = dof_handler.n_boundary_dofs()/n_blocks;
   dofs_per_block.back() = (dof_handler.n_boundary_dofs() -
index 0d2e046887ebbecc1d495b3eaad000feb0663629..73e051286b4e2836f7d5041f0292a91847aa563f 100644 (file)
@@ -35,7 +35,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
index c2e3f797da1cd2cb09653f7c7fe4ef5ed9d91be7..ce4f2e3fe1a44d1ec9c8c33b6f252ea829cbbb43 100644 (file)
@@ -34,7 +34,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
index e88a192fee71de1f3e68d20d3c4f98df547c0591..cfa8cbdeeb69db6ab2088df7fdde4b1c5dc8a652 100644 (file)
@@ -34,7 +34,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
index f758ee33944ae170427b95d8772ac2a20cff57a6..973e3fb307832ca107dc8fb8b71a1d9a6c302a6b 100644 (file)
@@ -34,7 +34,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
@@ -48,7 +48,7 @@ check_this (const DoFHandler<dim> &dof_handler)
                            n_blocks);
                                    // split dofs almost arbitrarily to
                                    // blocks
-  std::vector<unsigned int> dofs_per_block(n_blocks);
+  std::vector<types::global_dof_index> dofs_per_block(n_blocks);
   for (unsigned int i=0; i<n_blocks-1; ++i)
     dofs_per_block[i] = n_boundary_dofs/n_blocks;
   dofs_per_block.back() = (n_boundary_dofs -
index 1634cf490cc91c9aa42a80098f4c87b9af58c543..9be506ac0a59002f28091e6e6425749085293a91 100644 (file)
@@ -34,21 +34,21 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
 
   typename FunctionMap<dim>::type boundary_ids;
   boundary_ids[0] = 0;
-  const unsigned int n_boundary_dofs = dof_handler.n_boundary_dofs(boundary_ids);
+  const types::global_dof_index n_boundary_dofs = dof_handler.n_boundary_dofs(boundary_ids);
   const unsigned int n_blocks = std::min (dof_handler.get_fe().n_components(),
                                           n_boundary_dofs);
   BlockCompressedSparsityPattern sp (n_blocks,
                                      n_blocks);
                                    // split dofs almost arbitrarily to
                                    // blocks
-  std::vector<unsigned int> dofs_per_block(n_blocks);
+  std::vector<types::global_dof_index> dofs_per_block(n_blocks);
   for (unsigned int i=0; i<n_blocks-1; ++i)
     dofs_per_block[i] = n_boundary_dofs/n_blocks;
   dofs_per_block.back() = (n_boundary_dofs -
index ad9204f157d2a82844c46482b1b4e35522e97213..0cf3aaa769b7b77bcbce54fba058d643c5bfcb02 100644 (file)
@@ -34,21 +34,21 @@ check_this (const DoFHandler<dim> &dof_handler)
   if (dof_handler.get_fe().dofs_per_face == 0)
     return;
   
-  std::vector<unsigned int> map (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> map (dof_handler.n_dofs());
   std::set<types::boundary_id> set;
   set.insert (0);
   DoFTools::map_dof_to_boundary_indices (dof_handler, set, map);
 
   typename FunctionMap<dim>::type boundary_ids;
   boundary_ids[0] = 0;
-  const unsigned int n_boundary_dofs = dof_handler.n_boundary_dofs(boundary_ids);
+  const types::global_dof_index n_boundary_dofs = dof_handler.n_boundary_dofs(boundary_ids);
   const unsigned int n_blocks = std::min (dof_handler.get_fe().n_components(),
                                           n_boundary_dofs);
   BlockCompressedSetSparsityPattern sp (n_blocks,
                                      n_blocks);
                                    // split dofs almost arbitrarily to
                                    // blocks
-  std::vector<unsigned int> dofs_per_block(n_blocks);
+  std::vector<types::global_dof_index> dofs_per_block(n_blocks);
   for (unsigned int i=0; i<n_blocks-1; ++i)
     dofs_per_block[i] = n_boundary_dofs/n_blocks;
   dofs_per_block.back() = (n_boundary_dofs -
index 0f3da39a1c203f0918d5ff0abdc2ce0695572e0d..a91c04982e0162ad2d38fa9819d4d47883dadff0 100644 (file)
@@ -40,7 +40,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockSparsityPattern sp (n_components,
                            n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index 9c24ded7aa119dcbb5cb57137b37537797b94391..47e7d9c8c70a0d17d433f16c5e6d8b654e0275ee 100644 (file)
@@ -40,7 +40,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockCompressedSparsityPattern sp (n_components,
                                      n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index 60372a4709cde823d6c70a4ebfdbf8d37691f102..120ddf9e76c8853a74282c3213c2b88a41dc2766 100644 (file)
@@ -40,7 +40,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockCompressedSetSparsityPattern sp (n_components,
                                      n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index 2b31e78bc6086d82ae2af14aa9ab6df62a815857..db84ba43825588914f90b2758200eb42b8aa99f8 100644 (file)
@@ -65,7 +65,7 @@ my_check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockSparsityPattern sp (n_components,
                            n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index 3bdb08a9252bfa8f62e3b7d7a5588af394a95961..2cbdacd8f2227a34e58bcd82a122b1ad89458223 100644 (file)
@@ -66,7 +66,7 @@ my_check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockCompressedSparsityPattern sp (n_components,
                                      n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index 9f5e892c1d1f612da6288f76cef3042abb441230..4094c98e98d030d24ea20319baa6ea8d00e80e71 100644 (file)
@@ -66,7 +66,7 @@ my_check_this (const DoFHandler<dim> &dof_handler)
   const unsigned int n_components = dof_handler.get_fe().n_components();
   BlockCompressedSetSparsityPattern sp (n_components,
                                      n_components);
-  std::vector<unsigned int> dofs_per_component(n_components);
+  std::vector<types::global_dof_index> dofs_per_component(n_components);
   DoFTools::count_dofs_per_component (dof_handler,
                                       dofs_per_component);
   for (unsigned int i=0; i<n_components; ++i)
index f56a872e986726016486b98657bc73e6ee5f8fc8..c1c0e101e4a2e64dd04b1cfe588fef6bfc72f9fc 100644 (file)
@@ -204,8 +204,8 @@ void print_matching(DoFHandler<dim> &dof_handler, bool constrain_only_velocity =
 
   // Determine the orientation of the two faces:
 
-  std::vector<unsigned int> dofs_1(fe.dofs_per_face);
-  std::vector<unsigned int> dofs_2(fe.dofs_per_face);
+  std::vector<types::global_dof_index> dofs_1(fe.dofs_per_face);
+  std::vector<types::global_dof_index> dofs_2(fe.dofs_per_face);
   const unsigned int face_1_index = face_1->nth_active_fe_index(0);
   const unsigned int face_2_index = face_2->nth_active_fe_index(0);
   face_1->get_dof_indices(dofs_1, face_1_index);
index dcf31fc3d20d2f934fa3d4a17298a62d50c019a3..17aca148946b799a6ed81f2cfe9f14e307633116 100644 (file)
@@ -83,7 +83,8 @@ output_vector (const VECTOR &v)
 
                                    // write out at most 20 equispaced
                                    // elements of the vector
-  for (unsigned int i=0; i<v.size(); i+=std::max(1U,v.size()/20))
+  for (unsigned int i=0; i<v.size(); i+=std::max(static_cast<std::size_t>(1),
+        v.size()/20))
     deallog << v(i) << ' ';
   deallog << std::endl;
 }
index ad6edd4a5a3d0e3ced9e0b173635eb92ddaa3705..efdb92c3a066b5a900a66224ecbf67917ea03a36 100644 (file)
@@ -56,7 +56,7 @@ void LaplaceProblem<dim>::run ()
   SparsityPattern cell_connectivity;
   GridTools::get_face_connectivity_of_cells (triangulation,
                                             cell_connectivity);
-  std::vector<unsigned int> permutation(triangulation.n_active_cells());
+  std::vector<types::global_dof_index> permutation(triangulation.n_active_cells());
   SparsityTools::reorder_Cuthill_McKee (cell_connectivity, permutation);
 
   for (unsigned int i=0; i<permutation.size(); ++i)
index e74ef7281068328bf3ec62b22551985795025581..37519e75398fd2661dd6eb8aad5c632a1ef97ec3 100644 (file)
@@ -96,7 +96,7 @@ void test ()
                                    // and for A applying constraints
                                    // right away and for B applying
                                    // constraints later on
-  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 1f051876eece24a12ce2f13a4e5ca04a7802f8f4..ed71dafe3c7c32c994555f6e4d3d89feab02cb33 100644 (file)
@@ -106,7 +106,7 @@ void test ()
                                    // and for A applying constraints
                                    // right away and for B applying
                                    // constraints later on
-  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 9e40b81b11c0558ca28afa4bf43bd5db158ab1e6..b45577b6a1167339c1623acf30dab7dae1665e77 100644 (file)
@@ -36,7 +36,7 @@ void test ()
   SparseMatrix<double> m(sp);
 
                                // prepare structure with indices and values
-  std::vector<unsigned int> indices (m.n());
+  std::vector<types::global_dof_index> indices (m.n());
   for (unsigned int j=0; j<m.n(); ++j)
     indices[j] = j;
   std::vector<double> values (m.n());
index ae3f3cbb4dc3d603225a274cb5714251189a623a..2c3e7e0c0d4d9c71677690d348ea6e734bc99900 100644 (file)
@@ -36,7 +36,7 @@ void test ()
   SparseMatrix<double> m(sp);
 
                                // prepare structure with indices and values
-  std::vector<unsigned int> indices (m.n());
+  std::vector<types::global_dof_index> indices (m.n());
   for (unsigned int j=0; j<m.n(); ++j)
     indices[j] = j;
   std::vector<double> values (m.n());
index 4734d7aba284aca1542687b43d94a9917ec81c41..ebcdc410886f995151920d9a283dd513114e1e2a 100644 (file)
@@ -36,7 +36,7 @@ void test ()
   SparseMatrix<double> m(sp);
 
                                // prepare structure with indices and values
-  std::vector<unsigned int> indices (m.n());
+  std::vector<types::global_dof_index> indices (m.n());
   for (unsigned int j=0; j<m.n(); ++j)
     indices[j] = m.n()-1-j;
   std::vector<double> values (m.n());
index 1f3a4f91690d4e8852975c98133f2da4669c303a..070cbbcac446da2dda540e92fe57903b663bac98 100644 (file)
@@ -35,7 +35,7 @@ void test ()
   SparseMatrix<double> m(sp);
 
                                // prepare structure with indices and values
-  std::vector<unsigned int> indices (m.n());
+  std::vector<types::global_dof_index> indices (m.n());
   for (unsigned int j=0; j<m.n(); ++j)
     indices[j] = j;
   std::vector<double> values (m.n());
index 98098386ed13b015b3cb7f5292eacd244144345c..02d6f7314885510ef059d18884bf74f7cdf133ef 100644 (file)
@@ -35,7 +35,7 @@ void test ()
   SparseMatrix<double> m(sp);
 
                                // prepare structure with indices and values
-  std::vector<unsigned int> indices (m.n());
+  std::vector<types::global_dof_index> indices (m.n());
   for (unsigned int i=0; i<m.n(); ++i)
     indices[i] = m.n()-1-i;
   std::vector<double> values (m.n());
index d169f71cbea6c6cae13030883b23e556f400c3a8..288610173b139410d6f5554acd55a4cb428aa729 100644 (file)
@@ -36,7 +36,7 @@ void test ()
   SparseMatrix<double> m(sp);
 
                                // prepare structure with indices and values
-  std::vector<unsigned int> indices (m.n());
+  std::vector<types::global_dof_index> indices (m.n());
   for (unsigned int j=0; j<m.n(); ++j)
     indices[j] = j;
   std::vector<double> values (m.n());
index 9bce807338214e658895d5b4a28dbd10120d10c0..71007b824ecc5ad09873d6aba143934df523969b 100644 (file)
@@ -401,8 +401,8 @@ template <int dim>
 void DGMethod<dim>::assemble_system1 () 
 {
   const unsigned int dofs_per_cell = dof_handler.get_fe().dofs_per_cell;
-  std::vector<unsigned int> dofs (dofs_per_cell);
-  std::vector<unsigned int> dofs_neighbor (dofs_per_cell);
+  std::vector<types::global_dof_index> dofs (dofs_per_cell);
+  std::vector<types::global_dof_index> dofs_neighbor (dofs_per_cell);
 
   const UpdateFlags update_flags = update_values
                                    | update_gradients
index a52ab4b44af9f1ffd07d0b2f5e6db2fcce2a25b3..07a9112536043a98b8d62b601e9aab47bbbe8e23 100644 (file)
@@ -70,7 +70,7 @@ void test ()
   dof_handler.distribute_dofs (fe);
   deallog << dof_handler.n_dofs() << std::endl;
 
-  std::vector<unsigned int> new_indices (dof_handler.n_dofs());
+  std::vector<types::global_dof_index> new_indices (dof_handler.n_dofs());
   DoFRenumbering::compute_subdomain_wise (new_indices, dof_handler);
 
   for (unsigned int i=0; i<new_indices.size(); ++i)
index 2ae6c3d28f3df981776bc3353912fc9d16437ea3..b84256f9593ccb09aaf9614dbac7bb0a75c339fa 100644 (file)
@@ -48,7 +48,7 @@ void test() {
                                     // separatel
     for (unsigned int boundary_id=0; boundary_id<2; ++boundary_id)
       {
-       std::map<type::global_dof_index, double> bv;
+       std::map<types::global_dof_index, double> bv;
        VectorTools::interpolate_boundary_values (dof_handler,
                                                  boundary_id,
                                                  Functions::SquareFunction<spacedim>(),
index 8bf60f5b1c9525479a8d2bc5b97b128083482700..a2c860eb9c8e6b45ee2d947f129c837a203e4ddc 100644 (file)
@@ -70,7 +70,7 @@ void test() {
                                                  bv);
        deallog << bv.size() << " boundary degrees of freedom" << std::endl;
 
-       for (std::map<unsigned int, double>::const_iterator i = bv.begin();
+       for (std::map<types::global_dof_index, double>::const_iterator i = bv.begin();
             i != bv.end(); ++i)
          deallog << i->first << ' ' << i->second << std::endl;
 
index 91b93e151d7606df9a392de6775cbb680ffad833..68a93fd1fbfddae495c5fccde376605d5031ec69 100644 (file)
@@ -58,7 +58,7 @@ template <int dim>
 void
 print_dofs (const MGDoFHandler<dim> &dof, unsigned int level)
 {
-  std::vector<unsigned int> v (dof.get_fe().dofs_per_cell);
+  std::vector<types::global_dof_index> v (dof.get_fe().dofs_per_cell);
   for (typename MGDoFHandler<dim>::cell_iterator cell=dof.begin(level);
        cell != dof.end(level); ++cell)
     {
index 3bb924e0ce40bccdd4768ef9365fcf2067c2b3b7..f2f31b986e1196c8d530a6ec4d2c3abaf1d57463 100644 (file)
@@ -66,7 +66,7 @@ check ()
   DoFHandler<dim> dof(tr);
   
   dof.distribute_dofs(fe);
-  std::vector<unsigned int> new_dofs (dof.n_dofs());
+  std::vector<types::global_dof_index> new_dofs (dof.n_dofs());
   DoFRenumbering::boost::compute_Cuthill_McKee(new_dofs, dof);
 
   for (unsigned int i=0; i<new_dofs.size(); ++i)
index f09da6956a2f6b86ddeb0d0027f107b034dc7c7e..5ea87b6b29dfa9e0234ecff8d874f9d881f46d04 100644 (file)
@@ -57,7 +57,7 @@ check ()
   dof.begin_active()->set_active_fe_index(1);
   dof.distribute_dofs(element);
 
-  std::vector<unsigned int> count (element.n_components());
+  std::vector<types::global_dof_index> count (element.n_components());
   DoFTools::count_dofs_per_component (dof, count, true);
 
   for (unsigned int d=0; d<count.size(); ++d)
index 4aaea816adbe88588203a943df3ec459aee0dc36..f17f7e45a3ef482ad8059494adf685ed939d0125 100644 (file)
@@ -96,7 +96,7 @@ void MixedElastoPlasticity<dim>::make_grid_and_dofs()
 
        DoFRenumbering::component_wise(dof_handler);
 
-       std::vector<unsigned int> dofs_per_block(2);
+       std::vector<types::global_dof_index> dofs_per_block(2);
        DoFTools::count_dofs_per_block(dof_handler, dofs_per_block, block_component);
 
        const unsigned int n_stress_dof = dofs_per_block[0];
index bce56ebe86da9a0702f723542438b8f12bfb9d79..f6b74cad1b558302e54e4d9936a29680489aa9c9 100644 (file)
@@ -45,7 +45,7 @@
 
   
 void
-solve_filtered (std::map<unsigned int,double> &bv,
+solve_filtered (std::map<types::global_dof_index,double> &bv,
                SparseMatrix<double>          &A,
                Vector<double>                &u,
                Vector<double>                &f)
index 6d881b157a443c21c8e49cfe13fbd6b015c22c52..7387728549461a36a0845fb22667966fe4f83500 100644 (file)
@@ -40,7 +40,7 @@ int main ()
                                   // build up a map of vertex indices
                                   // of boundary vertices to the new
                                   // boundary points
-  std::map<unsigned int,Point<dim> > new_points;
+  std::map<types::global_dof_index,Point<dim> > new_points;
   
   Triangulation<dim>::active_cell_iterator cell=tria.begin_active(),
                                           endc=tria.end();
index 2559eaed474385e9fda136d0a16da58baf9c2303..0d3250ae0af248ec4e7255126b81cc1df21e6781 100644 (file)
@@ -67,11 +67,11 @@ void test(bool use_constraint_matrix)
 
   // "assemble":
 
-  std::vector<unsigned int> local_dofs1;
+  std::vector<types::global_dof_index> local_dofs1;
   for (unsigned int i=0;i<5;++i)
     local_dofs1.push_back(i);
 
-  std::vector<unsigned int> local_dofs2;
+  std::vector<types::global_dof_index> local_dofs2;
   local_dofs2.push_back(1);
   for (unsigned int i=1;i<5;++i)
     local_dofs2.push_back(3+i);
@@ -115,9 +115,9 @@ void test(bool use_constraint_matrix)
        }
 
       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));
+      boundary_values.insert (std::pair<types::global_dof_index,double>(1, -5.0));
+      boundary_values.insert (std::pair<types::global_dof_index,double>(3, 2.0));
+      boundary_values.insert (std::pair<types::global_dof_index,double>(4, 0.0));
       MatrixTools::apply_boundary_values (boundary_values,
                                          mat,
                                          solution,
index 88881930a8cbc315c88615eea8023d4ad2ccffa0..c57859a1f8bf1ef4bac6046631a6ba7501426508 100644 (file)
@@ -135,7 +135,7 @@ void AdvectionProblem<dim>::setup_system ()
                                              0,
                                              ConstantFunction<dim>(1.,2),
                                              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)
       {
index 5fa66fa1250242626259a21eee71afab77bdc724..132ce746190e7ef42ed7a6fdcdcce404e9e76c5a 100644 (file)
@@ -139,7 +139,7 @@ void AdvectionProblem<dim>::setup_system ()
                                              0,
                                              RightHandSide<dim>(),
                                              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)
       {
index f6ecedf81651295962587215dc57d9bb8d973d21..901855633c5c34a1eb1b463ed3f4674e20e34702 100644 (file)
@@ -129,7 +129,7 @@ void FindBug<dim>::make_grid_and_dofs ()
 template <int dim>
 void FindBug<dim>::dirichlet_conditions ()
 {
-  std::map<unsigned int,double> dirichlet_dofs;
+  std::map<types::global_dof_index,double> dirichlet_dofs;
   std::vector<bool> component_mask(dim+1, false);
   component_mask[dim] = true;
 
index aa8de378123a7488e764eaa873ae213a7ecfc820..8a7b29f574b530375957db20c88c408f9c68a27d 100644 (file)
@@ -67,7 +67,7 @@ check_boundary (const DoFHandler<dim> &dof,
 
   QGauss<dim-1> face_quadrature(6);
   
-  std::vector<unsigned int> dof_to_boundary_mapping;
+  std::vector<types::global_dof_index> dof_to_boundary_mapping;
   DoFTools::map_dof_to_boundary_indices (dof,
                                         dof_to_boundary_mapping);
 
index 8a9157f0d7cb1845caebfb9fe8ff4d4df417db39..1c5a229ea5684324752ea1556d579e90b2befc69 100644 (file)
@@ -132,7 +132,7 @@ void test_projection (const Triangulation<dim>& tr,
   MappingQ1<dim> mapping;
 
   TestFunction<dim> f(degree-1);
-  std::map<unsigned int, double> boundary_constraints;
+  std::map<types::global_dof_index, double> boundary_constraints;
   typename FunctionMap<dim>::type boundary_map;
   for (types::boundary_id i=0;i<255;++i)
     boundary_map[i] = &f;
@@ -145,7 +145,7 @@ void test_projection (const Triangulation<dim>& tr,
                                   // boundary values
   Vector<double> u(dof.n_dofs());
   u = -1.;
-  for (typename std::map<unsigned int, double>::const_iterator
+  for (typename std::map<types::global_dof_index, double>::const_iterator
         i = boundary_constraints.begin(); i != boundary_constraints.end(); ++i)
     u(i->first) = i->second;
   
index 612ef30a7a7cfb251a7d31b32ad2527387d55c29..daee93ba978aba760544bf8c1230e900325111c2 100644 (file)
@@ -60,7 +60,7 @@ template <int dim>
 void
 check_boundary (const DoFHandler<dim> &dof)
 {
-  std::vector<unsigned int> dof_to_boundary_mapping;
+  std::vector<types::global_dof_index> dof_to_boundary_mapping;
   DoFTools::map_dof_to_boundary_indices (dof,
                                         dof_to_boundary_mapping);
 
index 97e689df024bdc9719fed0c55156d3e24bc2de9b..1b9c2ec3b882a6022fd521890072621ba9216bb3 100644 (file)
@@ -59,7 +59,7 @@ template <int dim>
 void
 check_boundary (const DoFHandler<dim> &dof)
 {
-  std::vector<unsigned int> dof_to_boundary_mapping;
+  std::vector<types::global_dof_index> dof_to_boundary_mapping;
   DoFTools::map_dof_to_boundary_indices (dof,
                                         dof_to_boundary_mapping);
 
index 1e9284f20d355e1f3c80e48f459dd8a187e19eab..df5183ede502d1eb1d0e7c68b3751458d436bb73 100644 (file)
@@ -60,7 +60,7 @@ template <int dim>
 void
 check_boundary (const DoFHandler<dim> &dof)
 {
-  std::vector<unsigned int> dof_to_boundary_mapping;
+  std::vector<types::global_dof_index> dof_to_boundary_mapping;
   DoFTools::map_dof_to_boundary_indices (dof,
                                         dof_to_boundary_mapping);
 
index 6d8058aa07b86a4d1a8e42a4c6197d6e8b25d586..7196446416cda5a01c80f6dcba08ebdd5cdfd8f5 100644 (file)
@@ -60,7 +60,7 @@ template <int dim>
 void
 check_boundary (const DoFHandler<dim> &dof)
 {
-  std::vector<unsigned int> dof_to_boundary_mapping;
+  std::vector<types::global_dof_index> dof_to_boundary_mapping;
   DoFTools::map_dof_to_boundary_indices (dof,
                                         dof_to_boundary_mapping);
 
index 03a82bae0e16b795dea33b26b8e41867586dda7a..e3e08ba1208c78ac9f0fc578a6713f9ddfd2d60b 100644 (file)
@@ -40,7 +40,7 @@ void test ()
   DoFHandler<1,spacedim> dof_handler (tria);
   dof_handler.distribute_dofs (fe);
 
-  std::vector<unsigned int> dof_indices(fe.dofs_per_face);
+  std::vector<types::global_dof_index> dof_indices(fe.dofs_per_face);
 
   deallog << "Coarse mesh:" << std::endl;
   dof_handler.begin_active()->face(0)->get_dof_indices (dof_indices);
index 0e1438687c671b4ba6ebf26dfc9fbc47cc5b75af..e26dd75503702e9929e2388f28560197daaa8190 100644 (file)
@@ -35,7 +35,7 @@ void print_dofs (const typename hp::DoFHandler<1,spacedim>::face_iterator &i,
                 const unsigned int fe_index,
                 const unsigned int n)
 {
-  std::vector<unsigned int> dof_indices (n);
+  std::vector<types::global_dof_index> dof_indices (n);
   i->get_dof_indices (dof_indices, fe_index);
   for (unsigned int i=0; i<n; ++i)
     deallog << dof_indices[i] << ' ';
@@ -48,7 +48,7 @@ template <int spacedim>
 void print_dofs (const typename hp::DoFHandler<1,spacedim>::cell_iterator &i,
                 const unsigned int n)
 {
-  std::vector<unsigned int> dof_indices (n);
+  std::vector<types::global_dof_index> dof_indices (n);
   i->get_dof_indices (dof_indices);
   for (unsigned int i=0; i<n; ++i)
     deallog << dof_indices[i] << ' ';
index 2b83d4a3006d9cd02221db94d943003b2ca943da..01aee4512e198ab5cebe4d943a5cabedf64d4e4d 100644 (file)
@@ -51,7 +51,7 @@ void test()
   triangulation.refine_global (2);
   dof_handler.distribute_dofs (fe);
 
-  std::vector<unsigned int> dofs_per_component (fe.n_components());
+  std::vector<types::global_dof_index> dofs_per_component (fe.n_components());
   DoFTools::count_dofs_per_component (dof_handler, dofs_per_component);
 
   Assert (std::accumulate (dofs_per_component.begin(), dofs_per_component.end(), 0U)
index 2861defa337fb5f8835865ff74e69d22e9141070..b66358b52b9a65178ad5c16b40a4d03786b6615a 100644 (file)
@@ -67,12 +67,12 @@ void test ()
   dof_handler.distribute_dofs (fe_collection);
   deallog << dof_handler.n_dofs() << " dofs" << std::endl;
 
-  std::map<unsigned int, double> bv;
+  std::map<types::global_dof_index, double> bv;
   VectorTools::interpolate_boundary_values (dof_handler,
                                            0,
                                            ZeroFunction<dim>(2),
                                            bv);
-  for (std::map<unsigned int, double>::iterator
+  for (std::map<types::global_dof_index, double>::iterator
         p = bv.begin(); p!=bv.end(); ++p)
     deallog << p->first << ' ' << p->second << std::endl;
 }
index 75fd72215e628922ccf38208f1a9950d58a4db56..f2ec1b139d462e8c7fa0ba2bc84accb420b9157a 100644 (file)
@@ -39,7 +39,7 @@
 
 
 template <int dim>
-std::vector<unsigned int>
+std::vector<types::global_dof_index>
 get_dofs (const hp::DoFHandler<dim> &dof)
 {
   std::vector<types::global_dof_index> local;
index 87c27cb46d92694a081b37bd8f624ce8eeb30603..472e7cff1d1439f623d88938c7869b7073ce83e6 100644 (file)
@@ -571,8 +571,8 @@ template <int dim>
 void DGMethod<dim>::assemble_system2 () 
 {
   const unsigned int dofs_per_cell = dof_handler.get_fe()[0].dofs_per_cell;
-  std::vector<unsigned int> dofs (dofs_per_cell);
-  std::vector<unsigned int> dofs_neighbor (dofs_per_cell);
+  std::vector<types::global_dof_index> dofs (dofs_per_cell);
+  std::vector<types::global_dof_index> dofs_neighbor (dofs_per_cell);
 
   const UpdateFlags update_flags = update_values
                                    | update_gradients
index 5685759a48189ba6d9ecbfb5265d2d82ffb43937..098b33b7da4c2b438ec659c80f53ec81e48c0c99 100644 (file)
@@ -32,11 +32,11 @@ void test ()
       A(i,j) = i+j;
 
                                   // pick every other row and column
-  std::vector<unsigned int> rows (A.m()/2);
+  std::vector<types::global_dof_index> rows (A.m()/2);
   for (unsigned int i=0; i<rows.size(); ++i)
     rows[i] = 2*i;
 
-  std::vector<unsigned int> cols (A.n()/2);
+  std::vector<types::global_dof_index> cols (A.n()/2);
   for (unsigned int i=0; i<cols.size(); ++i)
     cols[i] = 2*i;
 
index 1b5fa4cf788891fd9a3e9ce8912897b1fc46bae1..85e35be70307c13da8fd8a3ffa954ead5d60210f 100644 (file)
@@ -243,8 +243,8 @@ int main()
       PreconditionSOR<> prec_sor;
       prec_sor.initialize(A, 1.);
 
-      std::vector<unsigned int> permutation(dim);
-      std::vector<unsigned int> inverse_permutation(dim);
+      std::vector<types::global_dof_index> permutation(dim);
+      std::vector<types::global_dof_index> inverse_permutation(dim);
 
                                       // Create a permutation: Blocks
                                       // backwards and every second
index 9d059c2afec2dcc048b34fdd7f1909316b79064d..a7f106b962a7bc34e5d2f4e0dffbb19a4f15ce7c 100644 (file)
@@ -89,8 +89,8 @@ int main()
          PreconditionBlock<SparseMatrix<double>,double>::AdditionalData prec_data(blocksize, 0.8);
          
                                           // The permutation vectors;
-         std::vector<unsigned int> bperm(n_blocks);
-         std::vector<unsigned int> ibperm(n_blocks);
+         std::vector<types::global_dof_index> bperm(n_blocks);
+         std::vector<types::global_dof_index> ibperm(n_blocks);
          
          relax_data.block_list.reinit(n_blocks, dim, blocksize);
          for (unsigned int block=0;block<n_blocks;++block)
index c1805a3468427e019b27eb59a6a2bef1d47ca467..24b1e45d774b565c7a94264fcc4be182ba813757 100644 (file)
@@ -121,8 +121,8 @@ main ()
        Assert (sp(sp.matrix_position(i).first,
                    sp.matrix_position(i).second) == i,
                ExcInternalError());
-      for (unsigned int row=0; row<sp.n_rows(); ++row)
-       for (unsigned int col=0; col<sp.n_cols(); ++col)
+      for (types::global_dof_index row=0; row<sp.n_rows(); ++row)
+       for (types::global_dof_index col=0; col<sp.n_cols(); ++col)
          if (sp(row,col) != SparsityPattern::invalid_entry)
            Assert (sp.matrix_position(sp(row,col)) ==
                    std::make_pair(row,col),
index 24a214d95fbd81c8db4d7f1eaafea783d2f41a65..e6af8cc51b154fb815cd654aed5827e48036bd54 100644 (file)
@@ -48,7 +48,7 @@ int main ()
   sp.compress ();
 
                                   // now find permutation
-  std::vector<unsigned int> permutation(4);
+  std::vector<types::global_dof_index> permutation(4);
   SparsityTools::reorder_Cuthill_McKee (sp, permutation);
 
   for (unsigned int i=0; i<permutation.size(); ++i)
index ba451965880d4f69b25b39ae0f8a938e81365a8f..457e11360a5baa5a813020352703e80da684d423 100644 (file)
@@ -333,7 +333,7 @@ namespace Step37
 
     diagonal_values = diagonal;
 
-    const std::vector<unsigned int> &
+    const std::vector<types::global_dof_index> &
     constrained_dofs = data.get_constrained_dofs();
     for (unsigned int i=0; i<constrained_dofs.size(); ++i)
       diagonal_values(constrained_dofs[i]) = 1.0;
@@ -437,7 +437,7 @@ namespace Step37
                                  boundary_indices);
     for (unsigned int level=0; level<nlevels; ++level)
       {
-        std::set<unsigned int>::iterator bc_it = boundary_indices[level].begin();
+        std::set<types::global_dof_index>::iterator bc_it = boundary_indices[level].begin();
         for ( ; bc_it != boundary_indices[level].end(); ++bc_it)
           mg_constraints[level].add_line(*bc_it);
 
index 2f79c333ca08c8788cb45d5a71734d5319d1a2fc..69e57d2011b26fa2d52f3ccec71bbb0726622ec2 100644 (file)
@@ -51,7 +51,7 @@ void test()
   DoFHandler<dim> dof_handler (triangulation);
   dof_handler.distribute_dofs (fe);
 
-  std::vector<types::global_dof_inex> dofs_per_block (fe.n_blocks());
+  std::vector<types::global_dof_index> dofs_per_block (fe.n_blocks());
   DoFTools::count_dofs_per_block (dof_handler, dofs_per_block);
 
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
index 7872b3dd84b9acc9060e08aa159965d026ba1eda..853c4778ec7256dc0b6bbbd11f1f1fd690b7809a 100644 (file)
@@ -44,7 +44,7 @@ void test()
                                        points);
   if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0)
     {
-      for (typename std::map<unsigned int, Point<dim> >::const_iterator
+      for (typename std::map<types::global_dof_index, Point<dim> >::const_iterator
             p = points.begin();
           p != points.end();
           ++p)
index a36a7be3931837fd8eaed009ca30dc6a37bcc835..ed764c2ae802ec9aa46fea0e14719682f688e8cd 100644 (file)
@@ -104,7 +104,7 @@ void test()
         if (!cell->is_artificial())
         {
           cell->get_dof_indices (local_dof_indices);
-          for (std::vector<unsigned int>::iterator it=local_dof_indices.begin(); it!= local_dof_indices.end(); ++it)
+          for (std::vector<types::global_dof_index>::iterator it=local_dof_indices.begin(); it!= local_dof_indices.end(); ++it)
             {
               unsigned int invalid_dofindex = DoFHandler<dim,dim>::invalid_dof_index;
               Assert(*it!=invalid_dofindex, ExcInternalError());
index ecbb3706ff40124dc34d84ed6966ac1cc8ffb5f8..6aa1515365f8ab918bf30ae8e27279883cebd4d1 100644 (file)
@@ -43,7 +43,7 @@ void test()
   csp.add(1,0);
   
   PETScWrappers::MPI::SparseMatrix mat;
-  std::vector< unsigned int > local_rows(numprocs,2);
+  std::vector<types::global_dof_index> local_rows(numprocs,2);
   
   mat.reinit(MPI_COMM_WORLD, csp, local_rows, local_rows, myid);
   
index 4de69e5d56c554c2c75a72068d1c45c6ce782d6b..92e5a51852a8fc6c982a3289cc1b94e41a6b82fc 100644 (file)
@@ -41,7 +41,7 @@ void test()
   csp.add(1,1);
 
   PETScWrappers::MPI::SparseMatrix mat;
-  std::vector< unsigned int > local_rows(numprocs, 0);
+  std::vector<types::global_dof_index> local_rows(numprocs, 0);
   local_rows[0]=2;
 
   mat.reinit(MPI_COMM_WORLD, csp, local_rows, local_rows, myid);
index d6cf7d124b9fa87e2fb7492d9d24df66f0f20c08..7a2da7ac161a30d5cf7da5e70d9bff618b3a8470 100644 (file)
@@ -43,14 +43,14 @@ void test ()
   TrilinosWrappers::MPI::Vector test1(locally_owned);
   if (myid==0)
   {
-    unsigned int idx[]={0,1,2,3,4,5,6,7,8};
+    types::global_dof_index idx[]={0,1,2,3,4,5,6,7,8};
     double val[]={0,1,2,3,4,5,6,7,8};
     test1.add(9,idx,val);
   }
   else
   {
    {
-      unsigned int idx[]={1,9,3,10,5,11,12,13,14};
+    types::global_dof_index idx[]={1,9,3,10,5,11,12,13,14};
     double val[]={1,9,3,10,5,11,12,13,14};
     test1.add(9,idx,val);
     }
index 8778f7f1a2c06e9ee79b882e42983f8fc393cc77..7e6ff6144972d8eb3bd0556628e0dd14102799fd 100644 (file)
@@ -40,7 +40,7 @@ bool operator == (const PETScWrappers::BlockVector &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 159f5aad00c46496fd01a6f515f36ee778b2d01d..126fc6470ad5912b99454590c2794b5be19a7553 100644 (file)
@@ -86,8 +86,8 @@ namespace dealii
                                         // compare dofs on this cell and then on the faces
        if (c1->has_children() == false)
          {
-           std::vector<types::local_dof_types> local_dofs_1 (c1->get_fe().dofs_per_cell);
-           std::vector<types::local_dof_types> local_dofs_2 (c2->get_fe().dofs_per_cell);
+           std::vector<types::local_dof_index> local_dofs_1 (c1->get_fe().dofs_per_cell);
+           std::vector<types::local_dof_index> local_dofs_2 (c2->get_fe().dofs_per_cell);
 
            c1->get_dof_indices (local_dofs_1);
            c2->get_dof_indices (local_dofs_2);
index 37b0da5966e33a656273b8769084d0d6634daccc..9a670d2bea6bea8eceea60fcda6af84988e74dee 100644 (file)
@@ -28,7 +28,7 @@
 
 void test (TrilinosWrappers::BlockVector &v)
 {
-  std::vector<unsigned int> sizes (2, 3);
+  std::vector<types::global_dof_index> sizes (2, 3);
   dealii::BlockVector<TrilinosScalar> w (sizes);
 
   for (unsigned int i=0; i<w.size(); ++i)
@@ -72,7 +72,7 @@ int main (int argc,char **argv)
   try
     {
       {
-       std::vector<unsigned int> sizes (2, 3);
+       std::vector<types::global_dof_index> sizes (2, 3);
         TrilinosWrappers::BlockVector v (sizes);
         test (v);
       }
index 22f08a02909d2640707a41f646834ee01ea82be6..81fab055dddb065feb0148d37b1b1b6f14effb83 100644 (file)
@@ -28,7 +28,7 @@
 
 void test (TrilinosWrappers::MPI::BlockVector &v)
 {
-  std::vector<unsigned int> sizes (2, 3);
+  std::vector<types::global_dof_index> sizes (2, 3);
   dealii::BlockVector<TrilinosScalar> w (sizes);
 
   for (unsigned int i=0; i<w.size(); ++i)
index 629051d70bbd401a76050ee0a658571bf435dc78..df522f69c8855738271c32f81c5b533836597cf4 100644 (file)
@@ -64,7 +64,8 @@ int main (int argc,char **argv)
   try
     {
       {
-        std::vector<unsigned int> row_lengths (5, 3U);
+        std::vector<types::global_dof_index> row_lengths (5,
+            static_cast<types::global_dof_index>(3));
         row_lengths.back() = 2;
         TrilinosWrappers::SparseMatrix m (5U,5U,row_lengths);
         test (m);
index 09745e2e76bebd3e7cc4dc66af593dc4f444b410..4e2c81fbed9d96d9e3e8d11b0289d603a79bf7dc 100644 (file)
@@ -78,8 +78,8 @@ void test (TrilinosWrappers::SparseMatrix &m)
       const double s = m.el(N/3,i);
       norm_sqr -= s*s;
     }
-  const unsigned int rows[2] = { N/3, N/2 };
-  m.clear_rows (std::vector<unsigned int>(&rows[0], &rows[2]));
+  const types::global_dof_index rows[2] = { N/3, N/2 };
+  m.clear_rows (std::vector<types::global_dof_index>(&rows[0], &rows[2]));
   
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;
index fce91f923090b522c08d865c94aa603e31cf4121..d2d03aed174e215cb0bd489441a4e1a6f434c0a8 100644 (file)
@@ -82,8 +82,8 @@ void test (TrilinosWrappers::SparseMatrix &m)
     }
   norm_sqr += 2*rnd*rnd;
   
-  const unsigned int rows[2] = { N/3, N/2 };
-  m.clear_rows (std::vector<unsigned int>(&rows[0], &rows[2]), rnd);
+  const types::global_dof_index rows[2] = { N/3, N/2 };
+  m.clear_rows (std::vector<types::global_dof_index>(&rows[0], &rows[2]), rnd);
   
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;
index 01b85b6a32ed68591df431b7d596dece4eeaa08c..dc9b928db1c167bcfd34320b8a73791e40fc44ef 100644 (file)
@@ -82,8 +82,8 @@ void test ()
          full_matrix(block_row*2+1,block_col*2) = -1.;
        }
 
-    std::vector<unsigned int> local_row_indices (2*m.n_block_rows());
-    std::vector<unsigned int> local_col_indices (2*m.n_block_cols());
+    std::vector<types::global_dof_index> local_row_indices (2*m.n_block_rows());
+    std::vector<types::global_dof_index> local_col_indices (2*m.n_block_cols());
 
     for (unsigned int i=0; i<block_size-1; ++i)
       {
index c71610f152fe3c3875cff237932e2941f297f7a7..55c130b590c84bb7b2a01d02c1c8b4ec2411858d 100644 (file)
@@ -83,8 +83,8 @@ void test ()
          full_matrix(block_row*2+1,block_col*2) = -1.;
        }
 
-    std::vector<unsigned int> local_row_indices (2*m.n_block_rows());
-    std::vector<unsigned int> local_col_indices (2*m.n_block_cols());
+    std::vector<types::global_dof_index> local_row_indices (2*m.n_block_rows());
+    std::vector<types::global_dof_index> local_col_indices (2*m.n_block_cols());
 
     for (unsigned int i=0; i<block_size-1; ++i)
       {
index 12f955dc6b808fa182ec576bdda7c95217414031..d3b3583052810870384b2f649ecf36ad0b299c5c 100644 (file)
@@ -41,7 +41,7 @@ bool operator == (const TrilinosWrappers::BlockVector &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 04ffb49891d5e7301f99935844c04ee9e04d18d6..dd998305e61f805292bc905fa23fb4abcf4e9d29 100644 (file)
@@ -40,7 +40,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
 
                                   // now add the same elements row-wise
   {
-    std::vector<unsigned int> col_indices (m.n()/3+1);
+    std::vector<types::global_dof_index> col_indices (m.n()/3+1);
     std::vector<double> col_values (m.n()/3+1);
     for (unsigned int i=0; i<m.m(); ++i)
       {
index 090fc2225ae23cea16b58e299d9b6142239d3ddc..47d46a8a1a7e03e6172566c72fa680593c439819 100644 (file)
@@ -57,7 +57,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
     FullMatrix<double> full_matrix(2,2);
     full_matrix(0,0) = full_matrix(1,1) = 1.;
     full_matrix(0,1) = full_matrix(1,0) = -1.;
-    std::vector<unsigned int> local_indices (2);
+    std::vector<types::global_dof_index> local_indices (2);
 
     for (unsigned int i=0; i<m.m()-1; ++i)
       {
index d204009651eafd0c5a86ddeb210848488ed83072..363b06d07a09252acad4f3080770aeb99dcfd884 100644 (file)
@@ -36,7 +36,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
 
                                   // now set the same elements row-wise
    {
-    std::vector<unsigned int> col_indices (m.n()/3+1);
+    std::vector<types::global_dof_index> col_indices (m.n()/3+1);
     std::vector<double> col_values (m.n()/3+1);
     for (unsigned int i=0; i<m.m(); ++i)
       {
index 7c8d405cfcd03dca7476d36187e30a027f8fa99e..4df0f2b226ab4109b11d5a56df2b9a019177c71e 100644 (file)
@@ -54,7 +54,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
     FullMatrix<double> full_matrix(2,2);
     full_matrix(0,0) = full_matrix(1,1) = 1.;
     full_matrix(0,1) = full_matrix(1,0) = -1.;
-    std::vector<unsigned int> local_indices (2);
+    std::vector<types::global_dof_index> local_indices (2);
 
     for (unsigned int i=0; i<m.m()-1; ++i)
       {
index 8036c17705462f040ad1421ee9d8f2dc5711f065..df2a0cee6154e52a88c1698662e88ba8e42c50bc 100644 (file)
@@ -122,7 +122,7 @@ void test ()
   
   deallog << "Number of dofs = " << dof_handler.n_dofs() << std::endl;
   
-  std::vector<unsigned int> size (dim);
+  std::vector<types::global_dof_index> size (dim);
   DoFTools::count_dofs_per_component(dof_handler, size);
   
   BlockSparsityPattern b_sparsity_pattern;

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.