]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Change a few places back to unsigned int, change one exception definition and fix...
authorkainan.wang <kainan.wang@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 3 Apr 2013 04:58:38 +0000 (04:58 +0000)
committerkainan.wang <kainan.wang@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 3 Apr 2013 04:58:38 +0000 (04:58 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29160 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/dofs/dof_accessor.templates.h
deal.II/include/deal.II/fe/fe_base.h
deal.II/include/deal.II/hp/dof_handler.h
deal.II/source/dofs/dof_handler.cc

index 7167e97d0da202184449efaadb27683f80a6ba66..8f6a07ae0bdbff36a2cff435b4db02f3187518c0 100644 (file)
@@ -1196,9 +1196,9 @@ namespace internal
       static
       types::global_dof_index
       get_vertex_dof_index (const dealii::DoFHandler<dim,spacedim> &dof_handler,
-                            const types::global_dof_index vertex_index,
+                            const unsigned int vertex_index,
                             const unsigned int fe_index,
-                            const types::global_dof_index local_index)
+                            const unsigned int 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"));
@@ -1220,9 +1220,9 @@ namespace internal
       static
       types::global_dof_index
       get_vertex_dof_index (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
-                            const types::global_dof_index vertex_index,
+                            const unsigned int vertex_index,
                             const unsigned int fe_index,
-                            const types::global_dof_index local_index)
+                            const unsigned int local_index)
       {
         Assert ( (fe_index != dealii::hp::DoFHandler<dim,spacedim>::default_fe_index),
                  ExcMessage ("You need to specify a FE index when working "
index 0ad4a65f8603740545053dbbafd93787477a2a6e..ddd8e1565d4ed2874d6a9b0ef497e6b15e8aff12 100644 (file)
@@ -206,13 +206,13 @@ public:
   /**
    * Number of degrees of freedom on a vertex.
    */
-  const types::global_dof_index dofs_per_vertex;
+  const unsigned int dofs_per_vertex;
 
   /**
    * Number of degrees of freedom in a line; not including the degrees of
    * freedom on the vertices of the line.
    */
-  const types::global_dof_index dofs_per_line;
+  const unsigned int dofs_per_line;
 
   /**
    * Number of degrees of freedom in a quadrilateral; not including the
index c8dfd8f11cec69ab828d6c3c98af1f71df203d0c..16a4dde274c408cccbb046ea1d7a2b4a024ed637 100644 (file)
@@ -577,7 +577,7 @@ namespace hp
      * Exception
      */
     DeclException1 (ExcNewNumbersNotConsecutive,
-                    int,
+                    types::global_dof_index,
                     << "The given list of new dof indices is not consecutive: "
                     << "the index " << arg1 << " does not exist.");
     /**
index 763fd9758c1f3f4d47975ceefab60b4149070d33..96a83d4beb2ae61cc3c1911268a9241761e66402 100644 (file)
@@ -86,8 +86,8 @@ namespace internal
       unsigned int
       max_couplings_between_dofs (const DoFHandler<1,spacedim> &dof_handler)
       {
-        return std::min(3*dof_handler.selected_fe->dofs_per_vertex +
-                        2*dof_handler.selected_fe->dofs_per_line,
+        return std::min(static_cast<types::global_dof_index>(3*dof_handler.selected_fe->dofs_per_vertex +
+                                                            2*dof_handler.selected_fe->dofs_per_line),
                         dof_handler.n_dofs());
       }
 

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.