]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fixed some inconsitencies between unsigned int and types::global_dof_index.
authorturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 7 Mar 2013 21:31:00 +0000 (21:31 +0000)
committerturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 7 Mar 2013 21:31:00 +0000 (21:31 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28801 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/base/table_handler.h
deal.II/include/deal.II/dofs/dof_accessor.templates.h
deal.II/include/deal.II/matrix_free/dof_info.templates.h
deal.II/include/deal.II/matrix_free/fe_evaluation.h
deal.II/include/deal.II/matrix_free/matrix_free.templates.h
deal.II/source/dofs/dof_tools.cc

index c760d35523724124fcd50fc0a5a09bd978adf5af..547a5e1b46faf4fa6eb406f95c54d625d5016bf5 100644 (file)
@@ -120,7 +120,7 @@ namespace internal
     /**
      * Abbreviation for the data type stored by this object.
      */
-    typedef boost::variant<int,unsigned int,double,std::string> value_type;
+    typedef boost::variant<int,unsigned int,unsigned long long int,double,std::string> value_type;
 
     /**
      * Stored value.
index ba46025ec92cdcc76ca95d32d0f5a348bbd60c79..7f15e6c2872702180be226cd67c1bac2c05c272f 100644 (file)
@@ -1294,7 +1294,7 @@ namespace internal
         const unsigned int starting_offset = dof_handler.vertex_dofs_offsets[vertex_index];
         const types::global_dof_index *pointer = &dof_handler.vertex_dofs[starting_offset];
 
-        Assert (*pointer != numbers::invalid_unsigned_int,
+        Assert (*pointer != numbers::invalid_size_type,
                 ExcInternalError());
 
         unsigned int counter = 0;
@@ -1302,7 +1302,7 @@ namespace internal
           {
             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);
 
             if (this_fe_index == numbers::invalid_unsigned_int)
index bbc15a0e9a787c41a362c6b482eb30d1156858a9..4455a2edb3a9941af699957b467a36b7b78c073d 100644 (file)
@@ -185,7 +185,7 @@ namespace internal
                                     dofs_per_cell[0] : dofs_per_cell[cell_active_fe_index[cell_number]];
       for (unsigned int i=0; i<dofs_this_cell; i++)
         {
-         types::global_dof_index current_dof =
+               types::global_dof_index current_dof =
             local_indices[lexicographic_inv[i]];
           const std::vector<std::pair<types::global_dof_index,double> >
           *entries_ptr =
@@ -299,7 +299,7 @@ no_constraint:
             {
               for (unsigned int i=0; i<dofs_this_cell; ++i)
                 {
-                 types::global_dof_index current_dof =
+                             types::global_dof_index current_dof =
                     local_indices[lexicographic_inv[i]];
                   if (n_mpi_procs > 1 &&
                       (current_dof < first_owned ||
index ac602ea835186cf6a8c81c1b736e98121c5209c7..b6674231670decc6d6f7fa656e4b82916b2e9906 100644 (file)
@@ -1807,7 +1807,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(cell);
+  const types::global_dof_index *dof_indices = dof_info.begin_indices(cell);
   const std::pair<unsigned short,unsigned short> *indicators =
     dof_info.begin_indicators(cell);
   const std::pair<unsigned short,unsigned short> *indicators_end =
index 3c38036ffa2f37ca6d43e7f65c3a945e0887aed2..ecc9ab7eabbefdbec3a00f07d3a4ba72fb492293 100644 (file)
@@ -412,7 +412,7 @@ void MatrixFree<dim,Number>::initialize_indices
   AssertDimension (n_fe, constraint.size());
 
   std::vector<types::global_dof_index> local_dof_indices;
-  std::vector<std::vector<unsigned int> > ghost_dofs(n_fe);
+  std::vector<std::vector<types::global_dof_index> > ghost_dofs(n_fe);
   std::vector<std::vector<std::vector<unsigned int> > > lexicographic_inv(n_fe);
 
   internal::MatrixFreeFunctions::ConstraintValues<double> constraint_values;
@@ -519,10 +519,10 @@ void MatrixFree<dim,Number>::initialize_indices
 
       // cache the constrained indices for use in matrix-vector products
       {
-        const unsigned int
+        const types::global_dof_index
         start_index = dof_info[no].vector_partitioner->local_range().first,
         end_index   = dof_info[no].vector_partitioner->local_range().second;
-        for (unsigned int i=start_index; i<end_index; ++i)
+        for (types::global_dof_index i=start_index; i<end_index; ++i)
           if (constraint[no]->is_constrained(i)==true)
             dof_info[no].constrained_dofs.push_back(i-start_index);
       }
index ae3fb7e44c91dc3ab6ea66fd0e4a08daefaadbe0..c05918b0057efdda35a6a67b3c58c010e0c687b9 100644 (file)
@@ -2383,7 +2383,7 @@ namespace DoFTools
                         subface->get_dof_indices (slave_dofs, subface_fe_index);
 
                         for (unsigned int i=0; i<slave_dofs.size(); ++i)
-                          Assert (slave_dofs[i] != numbers::invalid_unsigned_int,
+                          Assert (slave_dofs[i] != numbers::invalid_dof_index,
                                   ExcInternalError());
 
                         // Now create the element constraint for this

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.