From 38acdffed90e7ce96ae98c26cef8817bc0881f3e Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 10 Sep 2006 16:51:11 +0000 Subject: [PATCH] Rename FE::compare_for_domination to FE::compare_for_face_domination git-svn-id: https://svn.dealii.org/trunk@13889 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/fe/fe.h | 11 ++++++----- deal.II/deal.II/include/fe/fe_base.h | 10 +++++++++- deal.II/deal.II/include/fe/fe_dgp.h | 11 ++++++----- deal.II/deal.II/include/fe/fe_dgp_monomial.h | 11 ++++++----- deal.II/deal.II/include/fe/fe_dgp_nonparametric.h | 11 ++++++----- deal.II/deal.II/include/fe/fe_dgq.h | 11 ++++++----- deal.II/deal.II/include/fe/fe_q.h | 11 ++++++----- deal.II/deal.II/include/fe/fe_system.h | 11 ++++++----- deal.II/deal.II/source/fe/fe.cc | 2 +- deal.II/deal.II/source/fe/fe_dgp.cc | 2 +- deal.II/deal.II/source/fe/fe_dgp_monomial.cc | 2 +- deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc | 2 +- deal.II/deal.II/source/fe/fe_dgq.cc | 2 +- deal.II/deal.II/source/fe/fe_q.cc | 2 +- deal.II/deal.II/source/fe/fe_system.cc | 4 ++-- 15 files changed, 59 insertions(+), 44 deletions(-) diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index 399646cac7..cdb37a4239 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -1062,10 +1062,11 @@ class FiniteElement : public Subscriptor, /** * Return whether this element dominates - * the one given as argument, whether it - * is the other way around, whether - * neither dominates, or if either could - * dominate. + * the one given as argument when they + * meet at a common face, + * whether it is the other way around, + * whether neither dominates, or if + * either could dominate. * * For a definition of domination, see * FiniteElementBase::Domination and in @@ -1073,7 +1074,7 @@ class FiniteElement : public Subscriptor, */ virtual FiniteElementDomination::Domination - compare_for_domination (const FiniteElement &fe_other) const; + compare_for_face_domination (const FiniteElement &fe_other) const; //@} diff --git a/deal.II/deal.II/include/fe/fe_base.h b/deal.II/deal.II/include/fe/fe_base.h index d0bd90cc77..9da0892541 100644 --- a/deal.II/deal.II/include/fe/fe_base.h +++ b/deal.II/deal.II/include/fe/fe_base.h @@ -55,7 +55,7 @@ namespace FiniteElementDomination * dominates Q(k') if $k\le k'$. * * This enum is used in the - * FiniteElement::compare_fe_for_domination() + * FiniteElement::compare_for_face_domination() * function that is used in the context * of hp finite element methods when * determining what to do at faces where @@ -70,6 +70,14 @@ namespace FiniteElementDomination * domination: the dominated side is * constrained to the dominating one. * + * A similar situation happens in 3d, where + * we have to consider different elements + * meeting at only an edge, not an entire + * face. Such comparisons are then + * implemented in the + * FiniteElement::compare_for_line_domination() + * function. + * * Note that there are situations where * neither side dominates. The hp paper * lists two case, with the simpler one diff --git a/deal.II/deal.II/include/fe/fe_dgp.h b/deal.II/deal.II/include/fe/fe_dgp.h index 1e9385d3ec..874010a29b 100644 --- a/deal.II/deal.II/include/fe/fe_dgp.h +++ b/deal.II/deal.II/include/fe/fe_dgp.h @@ -194,10 +194,11 @@ class FE_DGP : public FE_Poly,dim> /** * Return whether this element dominates - * the one given as argument, whether it - * is the other way around, whether - * neither dominates, or if either could - * dominate. + * the one given as argument when they + * meet at a common face, + * whether it is the other way around, + * whether neither dominates, or if + * either could dominate. * * For a definition of domination, see * FiniteElementBase::Domination and in @@ -205,7 +206,7 @@ class FE_DGP : public FE_Poly,dim> */ virtual FiniteElementDomination::Domination - compare_for_domination (const FiniteElement &fe_other) const; + compare_for_face_domination (const FiniteElement &fe_other) const; /** * @} diff --git a/deal.II/deal.II/include/fe/fe_dgp_monomial.h b/deal.II/deal.II/include/fe/fe_dgp_monomial.h index cabf430e63..df79182e7e 100644 --- a/deal.II/deal.II/include/fe/fe_dgp_monomial.h +++ b/deal.II/deal.II/include/fe/fe_dgp_monomial.h @@ -195,10 +195,11 @@ class FE_DGPMonomial : public FE_Poly,dim> /** * Return whether this element dominates - * the one given as argument, whether it - * is the other way around, whether - * neither dominates, or if either could - * dominate. + * the one given as argument when they + * meet at a common face, + * whether it is the other way around, + * whether neither dominates, or if + * either could dominate. * * For a definition of domination, see * FiniteElementBase::Domination and in @@ -206,7 +207,7 @@ class FE_DGPMonomial : public FE_Poly,dim> */ virtual FiniteElementDomination::Domination - compare_for_domination (const FiniteElement &fe_other) const; + compare_for_face_domination (const FiniteElement &fe_other) const; /** * @} diff --git a/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h b/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h index 260ebc4bea..1f043d1844 100644 --- a/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h +++ b/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h @@ -350,10 +350,11 @@ class FE_DGPNonparametric : public FiniteElement /** * Return whether this element dominates - * the one given as argument, whether it - * is the other way around, whether - * neither dominates, or if either could - * dominate. + * the one given as argument when they + * meet at a common face, + * whether it is the other way around, + * whether neither dominates, or if + * either could dominate. * * For a definition of domination, see * FiniteElementBase::Domination and in @@ -361,7 +362,7 @@ class FE_DGPNonparametric : public FiniteElement */ virtual FiniteElementDomination::Domination - compare_for_domination (const FiniteElement &fe_other) const; + compare_for_face_domination (const FiniteElement &fe_other) const; /** * @} diff --git a/deal.II/deal.II/include/fe/fe_dgq.h b/deal.II/deal.II/include/fe/fe_dgq.h index 112dc39c82..b73f97ba45 100644 --- a/deal.II/deal.II/include/fe/fe_dgq.h +++ b/deal.II/deal.II/include/fe/fe_dgq.h @@ -266,10 +266,11 @@ class FE_DGQ : public FE_Poly,dim> /** * Return whether this element dominates - * the one given as argument, whether it - * is the other way around, whether - * neither dominates, or if either could - * dominate. + * the one given as argument when they + * meet at a common face, + * whether it is the other way around, + * whether neither dominates, or if + * either could dominate. * * For a definition of domination, see * FiniteElementBase::Domination and in @@ -277,7 +278,7 @@ class FE_DGQ : public FE_Poly,dim> */ virtual FiniteElementDomination::Domination - compare_for_domination (const FiniteElement &fe_other) const; + compare_for_face_domination (const FiniteElement &fe_other) const; /** * @} diff --git a/deal.II/deal.II/include/fe/fe_q.h b/deal.II/deal.II/include/fe/fe_q.h index dd7f60e28f..31733b0a53 100644 --- a/deal.II/deal.II/include/fe/fe_q.h +++ b/deal.II/deal.II/include/fe/fe_q.h @@ -423,10 +423,11 @@ class FE_Q : public FE_Poly,dim> /** * Return whether this element dominates - * the one given as argument, whether it - * is the other way around, whether - * neither dominates, or if either could - * dominate. + * the one given as argument when they + * meet at a common face, + * whether it is the other way around, + * whether neither dominates, or if + * either could dominate. * * For a definition of domination, see * FiniteElementBase::Domination and in @@ -434,7 +435,7 @@ class FE_Q : public FE_Poly,dim> */ virtual FiniteElementDomination::Domination - compare_for_domination (const FiniteElement &fe_other) const; + compare_for_face_domination (const FiniteElement &fe_other) const; //@} /** diff --git a/deal.II/deal.II/include/fe/fe_system.h b/deal.II/deal.II/include/fe/fe_system.h index e807507044..b9e764201b 100644 --- a/deal.II/deal.II/include/fe/fe_system.h +++ b/deal.II/deal.II/include/fe/fe_system.h @@ -525,10 +525,11 @@ class FESystem : public FiniteElement /** * Return whether this element dominates - * the one given as argument, whether it - * is the other way around, whether - * neither dominates, or if either could - * dominate. + * the one given as argument when they + * meet at a common face, + * whether it is the other way around, + * whether neither dominates, or if + * either could dominate. * * For a definition of domination, see * FiniteElementBase::Domination and in @@ -536,7 +537,7 @@ class FESystem : public FiniteElement */ virtual FiniteElementDomination::Domination - compare_for_domination (const FiniteElement &fe_other) const; + compare_for_face_domination (const FiniteElement &fe_other) const; //@} /** diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index 3ca65daf19..51a512399a 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -521,7 +521,7 @@ hp_quad_dof_identities (const FiniteElement &) const template FiniteElementDomination::Domination FiniteElement:: -compare_for_domination (const FiniteElement &) const +compare_for_face_domination (const FiniteElement &) const { Assert (false, ExcNotImplemented()); return FiniteElementDomination::neither_element_dominates; diff --git a/deal.II/deal.II/source/fe/fe_dgp.cc b/deal.II/deal.II/source/fe/fe_dgp.cc index bc3945796e..88e9491620 100644 --- a/deal.II/deal.II/source/fe/fe_dgp.cc +++ b/deal.II/deal.II/source/fe/fe_dgp.cc @@ -214,7 +214,7 @@ hp_quad_dof_identities (const FiniteElement &fe_other) const template FiniteElementDomination::Domination -FE_DGP::compare_for_domination (const FiniteElement &fe_other) const +FE_DGP::compare_for_face_domination (const FiniteElement &fe_other) const { // check whether both are discontinuous // elements and both could dominate, see diff --git a/deal.II/deal.II/source/fe/fe_dgp_monomial.cc b/deal.II/deal.II/source/fe/fe_dgp_monomial.cc index c5950e0e16..9495615b87 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_monomial.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_monomial.cc @@ -376,7 +376,7 @@ hp_quad_dof_identities (const FiniteElement &fe_other) const template FiniteElementDomination::Domination FE_DGPMonomial:: -compare_for_domination (const FiniteElement &fe_other) const +compare_for_face_domination (const FiniteElement &fe_other) const { // check whether both are discontinuous // elements and both could dominate, see diff --git a/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc b/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc index 4050ac8d26..3934f5f75f 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc @@ -545,7 +545,7 @@ hp_quad_dof_identities (const FiniteElement &fe_other) const template FiniteElementDomination::Domination FE_DGPNonparametric:: -compare_for_domination (const FiniteElement &fe_other) const +compare_for_face_domination (const FiniteElement &fe_other) const { // check whether both are discontinuous // elements and both could dominate, see diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index 42b433651c..ac8a77a31c 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -551,7 +551,7 @@ hp_quad_dof_identities (const FiniteElement &fe_other) const template FiniteElementDomination::Domination -FE_DGQ::compare_for_domination (const FiniteElement &fe_other) const +FE_DGQ::compare_for_face_domination (const FiniteElement &fe_other) const { // check whether both are discontinuous // elements and both could dominate, see diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index d55875a758..0f4d12c95e 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -681,7 +681,7 @@ hp_quad_dof_identities (const FiniteElement &fe_other) const template FiniteElementDomination::Domination FE_Q:: -compare_for_domination (const FiniteElement &fe_other) const +compare_for_face_domination (const FiniteElement &fe_other) const { if (const FE_Q *fe_q_other = dynamic_cast*>(&fe_other)) diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index 866a6eb361..126de218c7 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -2274,7 +2274,7 @@ FESystem::hp_quad_dof_identities (const FiniteElement &fe_other) const template FiniteElementDomination::Domination FESystem:: -compare_for_domination (const FiniteElement &fe_other) const +compare_for_face_domination (const FiniteElement &fe_other) const { // at present all we can do is to compare // with other FESystems that have the same @@ -2305,7 +2305,7 @@ compare_for_domination (const FiniteElement &fe_other) const // check who dominates and combine // with previous result domination = domination & (this->base_element(b) - .compare_for_domination (fe_sys_other->base_element(b))); + .compare_for_face_domination (fe_sys_other->base_element(b))); } // if we've gotten here, then we've -- 2.39.5