]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
fix my screw-up with renaming parameter names
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 13 Aug 2012 13:38:44 +0000 (13:38 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 13 Aug 2012 13:38:44 +0000 (13:38 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@25930 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/dofs/dof_accessor.templates.h

index 84621a8050b7c4eb43de805b22443340bc7de162..2f5c092e1607aa8209ed4224bf8653b20654ce1a 100644 (file)
@@ -14,6 +14,7 @@
 
 
 #include <deal.II/base/config.h>
+#include <deal.II/base/types.h>
 #include <deal.II/lac/constraint_matrix.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/dofs/dof_levels.h>
@@ -24,6 +25,7 @@
 #include <deal.II/grid/tria_iterator.templates.h>
 
 #include <vector>
+#include <limits>
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -1162,7 +1164,7 @@ namespace internal
                        Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError());
 
                                                         // a fe index is always small
-                       Assert((*pointer)<numeric_limits<unsigned int>::max(), ExcInternalError());
+                       Assert((*pointer)<std::numeric_limits<unsigned int>::max(), ExcInternalError());
                        const unsigned int this_fe_index = static_cast<unsigned int>(*pointer);
 
                        Assert (this_fe_index != numbers::invalid_unsigned_int,
@@ -1248,12 +1250,12 @@ namespace internal
                                              // 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 *pointer = &dof_handler.vertex_dofs[starting_offset];
+               const types::global_dof_index *pointer = &dof_handler.vertex_dofs[starting_offset];
                while (true)
                  {
                        Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError());
 
-                       Assert((*pointer)<numeric_limits<unsigned int>::max(), ExcInternalError());
+                       Assert((*pointer)<std::numeric_limits<unsigned int>::max(), ExcInternalError());
                        const unsigned int this_fe_index = static_cast<unsigned int>(*pointer);
 
                        Assert (this_fe_index != numbers::invalid_unsigned_int,
@@ -1303,7 +1305,7 @@ namespace internal
                  {
                        Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError());
 
-                       Assert((*pointer)<numeric_limits<unsigned int>::max(), ExcInternalError());
+                       Assert((*pointer)<std::numeric_limits<unsigned int>::max(), ExcInternalError());
                        const unsigned int this_fe_index = static_cast<unsigned int>(*pointer);
 
                        if (this_fe_index == numbers::invalid_unsigned_int)
@@ -1356,7 +1358,7 @@ namespace internal
                  {
                        Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError());
 
-                       Assert((*pointer)<numeric_limits<unsigned int>::max(), ExcInternalError());
+                       Assert((*pointer)<std::numeric_limits<unsigned int>::max(), ExcInternalError());
                        const unsigned int this_fe_index = static_cast<unsigned int>(*pointer);
 
                        Assert (this_fe_index < dof_handler.finite_elements->size(),
@@ -1416,7 +1418,7 @@ namespace internal
                  {
                        Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError());
 
-                       Assert((*pointer)<numeric_limits<unsigned int>::max(), ExcInternalError());
+                       Assert((*pointer)<std::numeric_limits<unsigned int>::max(), ExcInternalError());
                        const unsigned int this_fe_index = static_cast<unsigned int>(*pointer);
 
                        Assert (this_fe_index < dof_handler.finite_elements->size(),
@@ -1548,7 +1550,6 @@ DoFAccessor<structdim, DH>::vertex_dof_index (const unsigned int vertex,
 
 template<int structdim, class DH>
 inline
-unsigned
 types::global_dof_index
 DoFAccessor<structdim, DH>::mg_vertex_dof_index (const int level, const unsigned int vertex, const unsigned int i, const unsigned int fe_index) const {
   Assert (this->dof_handler != 0, ExcInvalidObject ());
@@ -2348,9 +2349,9 @@ namespace internal
                for (unsigned int vertex=0; vertex<2; ++vertex)
                  for (unsigned int d=0; d<dofs_per_vertex; ++d, ++index)
                        accessor.set_vertex_dof_index(vertex,d,
-                                                                 local_dof_indices[index]);
+                                                                 dof_indices[index]);
                for (unsigned int d=0; d<dofs_per_line; ++d, ++index)
-                 accessor.dof_index(d, local_dof_indices[index]);
+                 accessor.dof_index(d, dof_indices[index]);
 
                Assert (index == dofs_per_cell,
                            ExcInternalError());
@@ -2434,7 +2435,7 @@ namespace internal
                        accessor.line(line)->set_dof_index(accessor.dof_handler->get_fe().
                                                                           adjust_line_dof_index_for_line_orientation(d,
                                                                                                                                          accessor.line_orientation(line)),
-                                                                          local_dof_indices[index]);
+                                                                          dof_indices[index]);
                                              // now copy dof numbers into the face. for
                                              // faces with the wrong orientation, we
                                              // have already made sure that we're ok by
@@ -2455,9 +2456,9 @@ namespace internal
                                                                                                                                          accessor.face_orientation(quad),
                                                                                                                                          accessor.face_flip(quad),
                                                                                                                                          accessor.face_rotation(quad)),
-                                                                          local_dof_indices[index]);
+                                                                          dof_indices[index]);
                for (unsigned int d=0; d<dofs_per_hex; ++d, ++index)
-                 accessor.set_dof_index(d, local_dof_indices[index]);
+                 accessor.set_dof_index(d, dof_indices[index]);
 
                Assert (index == dofs_per_cell,
                            ExcInternalError());

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.