From cd63a09ae010d82038a755eb8baca05f63060e74 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 24 Feb 2011 03:19:34 +0000 Subject: [PATCH] Fix test. git-svn-id: https://svn.dealii.org/trunk@23445 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/dofs/dof_tools.cc | 34 ++++++++++ tests/hp/fe_nothing_12/cmp/generic | 104 +++-------------------------- 2 files changed, 45 insertions(+), 93 deletions(-) diff --git a/deal.II/source/dofs/dof_tools.cc b/deal.II/source/dofs/dof_tools.cc index 7d12eb0629..e8731c2108 100644 --- a/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/source/dofs/dof_tools.cc @@ -2435,6 +2435,40 @@ namespace internal const unsigned int subface_fe_index = subface->nth_active_fe_index(0); + // we sometime run + // into the + // situation where + // for example on + // one big cell we + // have a FE_Q(1) + // and on the + // subfaces we have + // a mixture of + // FE_Q(1) and + // FE_Nothing. In + // that case, the + // face domination + // is + // either_element_can_dominate + // for the whole + // collection of + // subfaces, but on + // the particular + // subface between + // FE_Q(1) and + // FE_Nothing, + // there are no + // constraints that + // we need to take + // care of. in that + // case, just + // continue + if (cell->get_fe().compare_for_face_domination + (subface->get_fe(subface_fe_index)) + == + FiniteElementDomination::no_requirements) + continue; + // Same procedure as for the // mother cell. Extract the face // DoFs from the cell DoFs. diff --git a/tests/hp/fe_nothing_12/cmp/generic b/tests/hp/fe_nothing_12/cmp/generic index a048c60600..c47fc961a1 100644 --- a/tests/hp/fe_nothing_12/cmp/generic +++ b/tests/hp/fe_nothing_12/cmp/generic @@ -1,95 +1,13 @@ -DEAL::8 dofs -DEAL::0 0 -DEAL::1 0 -DEAL::24 dofs -DEAL::0 0 -DEAL::1 0 -DEAL::2 0 -DEAL::3 0 -DEAL::4 0 -DEAL::5 0 -DEAL::8 0 -DEAL::9 0 -DEAL::10 0 -DEAL::11 0 -DEAL::14 0 -DEAL::15 0 -DEAL::16 0 -DEAL::17 0 -DEAL::18 0 -DEAL::19 0 -DEAL::20 0 -DEAL::21 0 -DEAL::22 0 -DEAL::23 0 -DEAL::72 dofs -DEAL::0 0 -DEAL::1 0 -DEAL::2 0 -DEAL::3 0 -DEAL::4 0 -DEAL::5 0 -DEAL::6 0 -DEAL::7 0 -DEAL::8 0 -DEAL::9 0 -DEAL::10 0 -DEAL::11 0 -DEAL::12 0 -DEAL::13 0 -DEAL::16 0 -DEAL::17 0 -DEAL::18 0 -DEAL::19 0 -DEAL::20 0 -DEAL::21 0 -DEAL::22 0 -DEAL::23 0 -DEAL::24 0 -DEAL::25 0 -DEAL::26 0 -DEAL::27 0 -DEAL::30 0 -DEAL::31 0 -DEAL::32 0 -DEAL::33 0 -DEAL::34 0 -DEAL::35 0 -DEAL::36 0 -DEAL::37 0 -DEAL::38 0 -DEAL::39 0 -DEAL::40 0 -DEAL::41 0 -DEAL::42 0 -DEAL::43 0 -DEAL::44 0 -DEAL::45 0 -DEAL::46 0 -DEAL::47 0 -DEAL::48 0 -DEAL::49 0 -DEAL::50 0 -DEAL::51 0 -DEAL::52 0 -DEAL::53 0 -DEAL::54 0 -DEAL::55 0 -DEAL::56 0 -DEAL::57 0 -DEAL::58 0 -DEAL::59 0 -DEAL::60 0 -DEAL::61 0 -DEAL::62 0 -DEAL::63 0 -DEAL::64 0 -DEAL::65 0 -DEAL::66 0 -DEAL::67 0 -DEAL::68 0 -DEAL::69 0 -DEAL::70 0 -DEAL::71 0 +DEAL:: Number of constraints: 1 +DEAL::0.1 1 +DEAL:: 0 1 2 3 +DEAL::1.0 0 +DEAL:: 4 5 6 7 +DEAL::1.1 1 +DEAL:: 8 9 10 11 +DEAL::1.2 0 +DEAL:: 6 7 12 13 +DEAL::1.3 1 +DEAL:: 10 11 14* 1 DEAL::OK -- 2.39.5