]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from upstream.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 5 Jan 2013 04:40:58 +0000 (04:40 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 5 Jan 2013 04:40:58 +0000 (04:40 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_deprecated@27930 0785d39b-7218-0410-832d-ea1e28bc413d

13 files changed:
1  2 
deal.II/include/deal.II/dofs/dof_handler.h
deal.II/include/deal.II/dofs/dof_renumbering.h
deal.II/include/deal.II/dofs/dof_tools.h
deal.II/include/deal.II/fe/fe_values.h
deal.II/include/deal.II/grid/tria.h
deal.II/include/deal.II/multigrid/mg_matrix.h
deal.II/include/deal.II/multigrid/mg_smoother.h
deal.II/include/deal.II/multigrid/mg_tools.h
deal.II/include/deal.II/multigrid/multigrid.h
deal.II/source/distributed/tria.cc
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/dofs/dof_tools.cc
deal.II/source/fe/mapping_q_eulerian.cc

index 3326700325438ba0b3a45f057f712c0e6d7d8fb1,799916ed579860ca59e86e3f56bbe8812832851a..8b2310ff0a75577e610b12616ca74ffadbd93f2e
@@@ -1129,44 -1071,36 +1071,55 @@@ namespace DoFRenumberin
     * level. See the other function
     * with the same name.
     */
-   template <int dim>
+   template <class DH>
    void
-   downstream (MGDoFHandler<dim> &dof_handler,
+   downstream (DH &dof_handler,
                const unsigned int level,
-               const Point<dim>  &direction,
+               const Point<DH::space_dimension>  &direction,
                const bool         dof_wise_renumbering = false);
  
 -  // The following three are only temporary for compatibility reasons and will be removed in 8.0
 +  /**
-    * @deprecated Use downstream()
-    * instead.
++   * This function does the downstream numbering for the individual
++   * levels of a multigrid hierarchy, but not for the global degrees
++   * of freedom.
++   *
++   * @deprecated Call downstream() function that takes a level
++   * argument for each of the levels of the multigrid hierarchy.
 +   */
-   template <int dim>
+   template <int dim, int spacedim>
    void
-   downstream_dg (MGDoFHandler<dim> &dof_handler,
-                  const unsigned int level,
-                  const Point<dim>  &direction) DEAL_II_DEPRECATED;
+   downstream (MGDoFHandler<dim,spacedim>               &dof_handler,
+               const Point<spacedim> &direction,
 -              const bool        dof_wise_renumbering = false);
++              const bool        dof_wise_renumbering = false) DEAL_II_DEPRECATED;
 +
 +  /**
-    * @deprecated The new function
-    * of this name computes the
-    * renumbering and its inverse at
-    * the same time. So, at least if
-    * you need both, you should use
-    * the other one.
-    *
-    * Computes the renumbering
-    * vector needed by the
-    * downstream_dg() function. Does
-    * not perform the renumbering on
-    * the DoFHandler dofs but
-    * returns the renumbering
-    * vector.
++   * @deprecated Use downstream() instead.
++   */
++  template <class DH>
++  void
++  downstream_dg (DH &dof,
++                 const Point<DH::space_dimension> &direction) DEAL_II_DEPRECATED;
+   template <class DH>
+   void
+   downstream_dg (DH &dof,
+                  const Point<DH::space_dimension> &direction)
+   {
+     downstream(dof, direction);
+   }
++
++  /**
++   * @deprecated Use downstream() instead.
 +   */
-   template <class DH, int dim>
+   template <class DH>
    void
-   compute_downstream_dg (std::vector<unsigned int> &new_dof_indices,
-                          const DH                  &dof_handler,
-                          const Point<dim>          &direction) DEAL_II_DEPRECATED;
+   downstream_dg (DH &dof,
+                  unsigned int level,
 -                 const Point<DH::space_dimension> &direction)
++                 const Point<DH::space_dimension> &direction) DEAL_II_DEPRECATED
+   {
+     downstream(dof, level, direction);
+   }
  
    /**
     * Computes the renumbering
Simple merge
index 78c79079e964cf40201dfe7f896309bd7e4e8b41,f7310a8387f22108dbb316c57be74ef122c58bb4..5876442e9de6c565cdd5916d432ad51f3666700a
@@@ -203,9 -203,9 +203,9 @@@ namespace MGTool
     */
    template <int dim, int spacedim>
    void
-   count_dofs_per_component (const MGDoFHandler<dim,spacedim> &mg_dof,
+   count_dofs_per_component (const DoFHandler<dim,spacedim> &mg_dof,
                              std::vector<std::vector<unsigned int> > &result,
 -                            std::vector<unsigned int> target_component);
 +                            std::vector<unsigned int> target_component) DEAL_II_DEPRECATED;
  
    /**
     * Generate a list of those
Simple merge
index 00358b0d104106010116849d8ca63193793cd666,9c9316f25674badb2a3dbb7ee32c5ff803e38346..998df0fafe8b707e28bd1987bdd747ad7265a845
@@@ -251,9 -252,9 +252,9 @@@ namespace interna
                                                             next_free_dof);
  
            // update the cache used for cell dof indices
-           for (typename DoFHandler<dim,spacedim>::cell_iterator
+           for (typename DoFHandler<dim,spacedim>::level_cell_iterator
                 cell = dof_handler.begin(); cell != dof_handler.end(); ++cell)
 -            if (cell->subdomain_id() != types::artificial_subdomain_id)
 +            if (cell->subdomain_id() != numbers::artificial_subdomain_id)
                cell->update_cell_dof_indices_cache ();
  
            // finally restore the user flags
Simple merge

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.