]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
The operator defined is actually an operator&, not operator|
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 1 Sep 2006 20:32:44 +0000 (20:32 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 1 Sep 2006 20:32:44 +0000 (20:32 +0000)
git-svn-id: https://svn.dealii.org/trunk@13795 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/fe_base.h
deal.II/deal.II/source/dofs/dof_tools.cc
deal.II/deal.II/source/fe/fe_system.cc

index c03c3a61b277349276bbe4000df18b54a42567ee..5ff310c5b0f328d3ba59cd9b53e9a66c22f43874 100644 (file)
@@ -113,7 +113,7 @@ namespace FiniteElementDomination
 
                                   /**
                                    * A generalization of the binary
-                                   * <code>or</code> operator to a comparison
+                                   * <code>and</code> operator to a comparison
                                    * relationship. The way this works is
                                    * pretty much as when you would want to
                                    * define a comparison relationship for
@@ -139,7 +139,7 @@ namespace FiniteElementDomination
                                    * then the returned value is
                                    * <code>neither_element_dominates</code>.
                                    */
-  Domination operator | (const Domination d1,
+  Domination operator & (const Domination d1,
                         const Domination d2);
 }
 
@@ -594,7 +594,7 @@ class FiniteElementData
 namespace FiniteElementDomination
 {
   inline
-  Domination operator | (const Domination d1,
+  Domination operator & (const Domination d1,
                         const Domination d2)
   {
     switch (d1)
index b59925e8d5a5deb66dae759fc33e9f4a22498d58..0e90ade63971f5d68b480fac42c23aae2a15b633 100644 (file)
@@ -2137,7 +2137,7 @@ namespace internal
              FiniteElementDomination::Domination
                mother_face_dominates = FiniteElementDomination::either_element_can_dominate;
              for (unsigned int c=0; c<GeometryInfo<dim>::subfaces_per_face; ++c)
-               mother_face_dominates = mother_face_dominates |
+               mother_face_dominates = mother_face_dominates &
                                        (cell->get_fe().compare_for_domination
                                         (cell->neighbor_child_on_subface (face, c)->get_fe()));
 
@@ -2296,7 +2296,7 @@ namespace internal
                          domination = FiniteElementDomination::either_element_can_dominate;
                        for (unsigned int sf=0; sf<GeometryInfo<dim>::subfaces_per_face; ++sf)
                          if (sf != dominating_subface_no)
-                           domination = domination |
+                           domination = domination &
                                         cell->neighbor_child_on_subface (face, dominating_subface_no)
                                         ->get_fe().compare_for_domination
                                         (cell->neighbor_child_on_subface (face, sf)->get_fe());
index 5a877700eba13458915c957039ea39593b83f427..74aa47356882c71389ba1dbfabaf69fb987b38fe 100644 (file)
@@ -2305,7 +2305,7 @@ compare_for_domination (const FiniteElement<dim> &fe_other) const
                                           // for this pair of base elements,
                                           // check who dominates and combine
                                           // with previous result
-         domination = domination | (this->base_element(b)
+         domination = domination & (this->base_element(b)
                                     .compare_for_domination (fe_sys_other->base_element(b)));
        }
 

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.