]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from mainline.
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 30 Aug 2012 19:16:20 +0000 (19:16 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 30 Aug 2012 19:16:20 +0000 (19:16 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_merge_mg_into_dof_handler@26174 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/source/dofs/dof_handler.cc
deal.II/source/dofs/dof_tools.cc
deal.II/source/hp/dof_handler.cc

index 0311f713b5627518fd6e5703dac7532241d32b19,7a793fd719597c1407af57e894d007ebe7e74c1d..19f231648e01d4ccf0128cdffb7d1c6268b21d02
@@@ -1909,8 -1579,8 +1909,8 @@@ template<int dim, int spacedim
  unsigned int
  DoFHandler<dim,spacedim>::n_boundary_dofs (const FunctionMap &boundary_indicators) const
  {
-   Assert (boundary_indicators.find(types::internal_face_boundary_id) == boundary_indicators.end(),
+   Assert (boundary_indicators.find(numbers::internal_face_boundary_id) == boundary_indicators.end(),
 -          ExcInvalidBoundaryIndicator());
 +            ExcInvalidBoundaryIndicator());
  
    std::set<int> boundary_dofs;
  
@@@ -1935,8 -1605,8 +1935,8 @@@ template<int dim, int spacedim
  unsigned int
  DoFHandler<dim,spacedim>::n_boundary_dofs (const std::set<types::boundary_id> &boundary_indicators) const
  {
-   Assert (boundary_indicators.find (types::internal_face_boundary_id) == boundary_indicators.end(),
+   Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(),
 -          ExcInvalidBoundaryIndicator());
 +            ExcInvalidBoundaryIndicator());
  
    std::set<int> boundary_dofs;
  
index 8beb80b21c716e1275505492dea0b82b4c187a96,6b7d7276663c6390ef8b6851b96615c7ea7cee34..24638fcec665cd1fe41c6a9c70a022a52bb502b6
@@@ -472,12 -472,12 +472,12 @@@ namespace DoFTool
      const unsigned int n_dofs = dof.n_dofs();
  
      AssertDimension (dof_to_boundary_mapping.size(), n_dofs);
-     Assert (boundary_indicators.find(types::internal_face_boundary_id) == boundary_indicators.end(),
+     Assert (boundary_indicators.find(numbers::internal_face_boundary_id) == boundary_indicators.end(),
 -            typename DH::ExcInvalidBoundaryIndicator());
 +              typename DH::ExcInvalidBoundaryIndicator());
      Assert (sparsity.n_rows() == dof.n_boundary_dofs (boundary_indicators),
 -            ExcDimensionMismatch (sparsity.n_rows(), dof.n_boundary_dofs (boundary_indicators)));
 +              ExcDimensionMismatch (sparsity.n_rows(), dof.n_boundary_dofs (boundary_indicators)));
      Assert (sparsity.n_cols() == dof.n_boundary_dofs (boundary_indicators),
 -            ExcDimensionMismatch (sparsity.n_cols(), dof.n_boundary_dofs (boundary_indicators)));
 +              ExcDimensionMismatch (sparsity.n_cols(), dof.n_boundary_dofs (boundary_indicators)));
  #ifdef DEBUG
      if (sparsity.n_rows() != 0)
        {
    template <class DH>
    void
    extract_dofs_with_support_on_boundary (const DH                      &dof_handler,
 -                                         const std::vector<bool>       &component_select,
 -                                         std::vector<bool>             &selected_dofs,
 -                                         const std::set<types::boundary_id> &boundary_indicators)
 +                                                           const std::vector<bool>       &component_select,
 +                                                           std::vector<bool>             &selected_dofs,
 +                                                           const std::set<types::boundary_id> &boundary_indicators)
    {
      AssertDimension (component_select.size(), n_components(dof_handler));
-     Assert (boundary_indicators.find (types::internal_face_boundary_id) == boundary_indicators.end(),
+     Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(),
 -            ExcInvalidBoundaryIndicator());
 +              ExcInvalidBoundaryIndicator());
  
                                       // let's see whether we have to
                                       // check for certain boundary
      std::vector<unsigned int>     &mapping)
    {
      Assert (&dof_handler.get_fe() != 0, ExcNoFESelected());
-     Assert (boundary_indicators.find (types::internal_face_boundary_id) == boundary_indicators.end(),
+     Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(),
 -            ExcInvalidBoundaryIndicator());
 +              ExcInvalidBoundaryIndicator());
  
      mapping.clear ();
      mapping.insert (mapping.end(), dof_handler.n_dofs(),
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.