]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix some errors. Step one to six of the tutorial compile and run.
authorturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 6 Mar 2013 17:21:45 +0000 (17:21 +0000)
committerturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 6 Mar 2013 17:21:45 +0000 (17:21 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28759 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/dofs/dof_accessor.templates.h
deal.II/include/deal.II/lac/constraint_matrix.h
deal.II/include/deal.II/lac/constraint_matrix.templates.h
deal.II/source/multigrid/mg_tools.inst.in

index 9c49af18e8b9faebeec5d984bca0e88a63cb3f38..ba46025ec92cdcc76ca95d32d0f5a348bbd60c79 100644 (file)
@@ -1193,11 +1193,11 @@ namespace internal
 
       template <int dim, int spacedim>
       static
-      unsigned int
+      types::global_dof_index
       get_vertex_dof_index (const dealii::DoFHandler<dim,spacedim> &dof_handler,
-                            const unsigned int vertex_index,
+                            const types::global_dof_index vertex_index,
                             const unsigned int fe_index,
-                            const unsigned int local_index)
+                            const types::global_dof_index local_index)
       {
         Assert ((fe_index == dealii::DoFHandler<dim,spacedim>::default_fe_index),
                 ExcMessage ("Only the default FE index is allowed for non-hp DoFHandler objects"));
@@ -1217,11 +1217,11 @@ namespace internal
 
       template<int dim, int spacedim>
       static
-      unsigned int
+      types::global_dof_index
       get_vertex_dof_index (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
-                            const unsigned int vertex_index,
+                            const types::global_dof_index vertex_index,
                             const unsigned int fe_index,
-                            const unsigned int local_index)
+                            const types::global_dof_index local_index)
       {
         Assert ( (fe_index != dealii::hp::DoFHandler<dim,spacedim>::default_fe_index),
                  ExcMessage ("You need to specify a FE index when working "
@@ -1246,13 +1246,13 @@ namespace internal
         // part. trigger an exception if
         // we can't find a set for this
         // particular fe_index
-        const unsigned int starting_offset = dof_handler.vertex_dofs_offsets[vertex_index];
+        const types::global_dof_index starting_offset = dof_handler.vertex_dofs_offsets[vertex_index];
         const types::global_dof_index *pointer = &dof_handler.vertex_dofs[starting_offset];
         while (true)
           {
             Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError());
 
-            Assert((*pointer)<std::numeric_limits<unsigned int>::max(), ExcInternalError());
+            Assert((*pointer)<std::numeric_limits<types::global_dof_index>::max(), ExcInternalError());
             const unsigned int this_fe_index = static_cast<unsigned int>(*pointer);
 
             Assert (this_fe_index != numbers::invalid_unsigned_int,
@@ -2286,7 +2286,7 @@ DoFAccessor<0,DH<1,spacedim>, lda>::get_dof_indices (
   std::vector<types::global_dof_index> &dof_indices,
   const unsigned int fe_index) const
 {
-  for (unsigned int i=0; i<dof_indices.size(); ++i)
+  for (types::global_dof_index i=0; i<dof_indices.size(); ++i)
     dof_indices[i]
       = dealii::internal::DoFAccessor::Implementation::get_vertex_dof_index (
           *dof_handler,
index 8c261bcc9339b74429351390ce1602a56bd13fc9..aec4c1ebc72bfabe0ffe2cba0827dd2f179b81e3 100644 (file)
@@ -1855,7 +1855,7 @@ ConstraintMatrix::add_line (const size_type line)
   if (line_index >= lines_cache.size())
     lines_cache.resize (std::max(2*static_cast<size_type>(lines_cache.size()),
                                  line_index+1),
-                        numbers::invalid_unsigned_int);
+                        numbers::invalid_size_type);
 
   // push a new line to the end of the
   // list
@@ -1936,7 +1936,7 @@ ConstraintMatrix::is_constrained (const size_type index) const
   const size_type line_index = calculate_line_index(index);
   return ((line_index < lines_cache.size())
           &&
-          (lines_cache[line_index] != numbers::invalid_unsigned_int));
+          (lines_cache[line_index] != numbers::invalid_size_type));
 }
 
 
index 3aac17b9eb9cf17529a73edda9be403befcb803f..35c6b4155ab1335e0f70a79f819e3202a337dcf2 100644 (file)
@@ -2242,7 +2242,7 @@ make_sorted_row_list (const std::vector<size_type> &local_dof_indices,
                 Utilities::lower_bound(active_dofs.begin(),
                                        active_dofs.end()-i+1,
                                        new_index);
-              if (*it != new_index)
+              if (*it != new_index)               
                 active_dofs.insert(it, new_index);
             }
         }
index eb1926c14b2164d4da005b941892972b9e2fca1e..d4d787025f92f341afea72de9f9928289d50c2fa 100644 (file)
@@ -127,13 +127,13 @@ for (deal_II_dimension : DIMENSIONS)
 #if deal_II_dimension < 3
       template void count_dofs_per_block (
        const DoFHandler<deal_II_dimension,deal_II_dimension+1>&,
-       std::vector<std::vector<types::global_dof_index> >&, std::vector<types::global_dof_index>);
+       std::vector<std::vector<types::global_dof_index> >&, std::vector<unsigned int>);
 #endif
 
 #if deal_II_dimension == 3
       template void count_dofs_per_block (
        const DoFHandler<1,3>&,
-       std::vector<std::vector<types::global_dof_index> >&, std::vector<types::global_dof_index>);
+       std::vector<std::vector<types::global_dof_index> >&, std::vector<unsigned int>);
 #endif
     \}
   }

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.