From: heister Date: Thu, 30 Aug 2012 19:16:20 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93262aa232199f51d28cdd2e501bb245ed4e0f81;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_merge_mg_into_dof_handler@26174 0785d39b-7218-0410-832d-ea1e28bc413d --- 93262aa232199f51d28cdd2e501bb245ed4e0f81 diff --cc deal.II/source/dofs/dof_handler.cc index 0311f713b5,7a793fd719..19f231648e --- a/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/source/dofs/dof_handler.cc @@@ -1909,8 -1579,8 +1909,8 @@@ template::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 boundary_dofs; @@@ -1935,8 -1605,8 +1935,8 @@@ template::n_boundary_dofs (const std::set &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 boundary_dofs; diff --cc deal.II/source/dofs/dof_tools.cc index 8beb80b21c,6b7d727666..24638fcec6 --- a/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/source/dofs/dof_tools.cc @@@ -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) { @@@ -4071,13 -4071,13 +4071,13 @@@ template void extract_dofs_with_support_on_boundary (const DH &dof_handler, - const std::vector &component_select, - std::vector &selected_dofs, - const std::set &boundary_indicators) + const std::vector &component_select, + std::vector &selected_dofs, + const std::set &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 @@@ -5875,8 -5875,8 +5875,8 @@@ std::vector &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(),