do not bias user data typ in constructor

git-svn-id: https://svn.dealii.org/trunk@15007 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h
index 7680f26837641a36b7d9c032f0d7a864d82a086a..b2bd31b35fbaf01893fc5260709a739cbcf72a57 100644 (file)
--- a/deal.II/deal.II/include/grid/tria_accessor.h
+++ b/deal.II/deal.II/include/grid/tria_accessor.h
@@ -654,6 +654,12 @@ class TriaObjectAccessor :  public TriaAccessor<celldim,dim>
                                      */
     void recursively_clear_user_flag () const;
 
+                                    /**
+                                     * Reset the user data to zero,
+                                     * independent if pointer or index.
+                                     */
+    void clear_user_data () const;
+    
                                     /**
                                      * Set the user pointer
                                      * to @p p.
@@ -1320,6 +1326,12 @@ class TriaObjectAccessor<1, dim> :  public TriaAccessor<1,dim>
                                      */
     void recursively_clear_user_flag () const;
 
+                                    /**
+                                     * Reset the user data to zero,
+                                     * independent if pointer or index.
+                                     */
+    void clear_user_data () const;
+    
                                     /**
                                      * Set the user pointer of this
                                      * line to @p p.
@@ -1953,6 +1965,12 @@ class TriaObjectAccessor<2, dim> :  public TriaAccessor<2,dim>
                                      */
     void recursively_clear_user_flag () const;
 
+                                    /**
+                                     * Reset the user data to zero,
+                                     * independent if pointer or index.
+                                     */
+    void clear_user_data () const;
+    
                                     /**
                                      * Set the user pointer of this
                                      * quad to @p p.
@@ -2621,6 +2639,12 @@ class TriaObjectAccessor<3, dim> :  public TriaAccessor<3,dim>
                                      */
     void recursively_clear_user_flag () const;
 
+                                    /**
+                                     * Reset the user data to zero,
+                                     * independent if pointer or index.
+                                     */
+    void clear_user_data () const;
+    
                                     /**
                                      * Set the user pointer of this
                                      * hex to @p p.

diff --git a/deal.II/deal.II/include/grid/tria_objects.h b/deal.II/deal.II/include/grid/tria_objects.h
index a41f84b4fdd50c79f023d2950164299fbe0d1e93..b517f4fc4231bd7902e3f3abce9871e5829bef95 100644 (file)
--- a/deal.II/deal.II/include/grid/tria_objects.h
+++ b/deal.II/deal.II/include/grid/tria_objects.h
@@ -198,6 +198,11 @@ namespace internal
                                          */
        unsigned int user_index(const unsigned int i) const;
 
+                                        /**
+                                         * Reset user data to zero.
+                                         */
+       void clear_user_data(const unsigned int i);
+       
                                         /**
                                          * Clear all user pointers or
                                          * indices and reset their
@@ -549,6 +554,16 @@ namespace internal
     }
     
     
+    template<typename G>
+    inline
+    void
+    TriaObjects<G>::clear_user_data (const unsigned int i)
+    {
+      Assert(i<user_data.size(), ExcIndexRange(i,0,user_data.size()));
+      user_data[i].i = 0;
+    }
+    
+    
     template <typename G>
     inline
     TriaObjects<G>::TriaObjects()

diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc
index 5987b86fd47493dd8c8e54871a72ebf518b1fe14..367e211b01320090c364eb8697b1f53f2660ec89 100644 (file)
--- a/deal.II/deal.II/source/grid/tria.cc
+++ b/deal.II/deal.II/source/grid/tria.cc
@@ -329,7 +329,7 @@ void Triangulation<1>::create_triangulation (const std::vector<Point<1> >    &v,
                                    cells[cell].vertices[1]));
       next_free_line->set_used_flag ();
       next_free_line->set_material_id (cells[cell].material_id);
-      next_free_line->clear_user_pointer ();
+      next_free_line->clear_user_data ();
       next_free_line->set_subdomain_id (0);
       
                                       // note that this cell is
@@ -613,7 +613,7 @@ void Triangulation<2>::create_triangulation (const std::vector<Point<2> >    &v,
                                                    i->first.second));
          line->set_used_flag ();
          line->clear_user_flag ();
-         line->clear_user_pointer ();
+         line->clear_user_data ();
          i->second = line;
        }
     }
@@ -642,7 +642,7 @@ void Triangulation<2>::create_triangulation (const std::vector<Point<2> >    &v,
          
          cell->set_used_flag ();
          cell->set_material_id (cells[c].material_id);
-         cell->clear_user_pointer ();
+         cell->clear_user_data ();
          cell->set_subdomain_id (0);
          
                                           // note that this cell is
@@ -1035,7 +1035,7 @@ Triangulation<3>::create_triangulation (const std::vector<Point<3> >    &v,
                                                    i->first.second));
          line->set_used_flag ();
          line->clear_user_flag ();
-         line->clear_user_pointer ();
+         line->clear_user_data ();
 
                                           // now set the iterator for
                                           // this line
@@ -1214,7 +1214,7 @@ Triangulation<3>::create_triangulation (const std::vector<Point<3> >    &v,
          quad->set (q->first);
          quad->set_used_flag ();
          quad->clear_user_flag ();
-         quad->clear_user_pointer ();
+         quad->clear_user_data ();
                                           // set the line orientation
          quad->set_line_orientation(0,q->second.second[0]);
          quad->set_line_orientation(1,q->second.second[1]);
@@ -1403,7 +1403,7 @@ Triangulation<3>::create_triangulation (const std::vector<Point<3> >    &v,
          cell->set_used_flag ();
          cell->set_material_id (cells[c].material_id);
          cell->clear_user_flag ();
-         cell->clear_user_pointer ();
+         cell->clear_user_data ();
          cell->set_subdomain_id (0);
 
                                            // set orientation flag for
@@ -5069,13 +5069,13 @@ Triangulation<1>::execute_refinement ()
              ++next_unused_cell;
            first_child = next_unused_cell;
            first_child->set_used_flag ();
-           first_child->clear_user_pointer ();
+           first_child->clear_user_data ();
            ++next_unused_cell;
            Assert (next_unused_cell->used() == false,
                    ExcCellShouldBeUnused());
            second_child = next_unused_cell;
            second_child->set_used_flag ();
-           second_child->clear_user_pointer ();
+           second_child->clear_user_data ();
 
                                             // insert first child
            cell->set_children (first_child->index());
@@ -5418,8 +5418,8 @@ Triangulation<2>::execute_refinement ()
            children[1]->set_used_flag();
            children[0]->clear_children();
            children[1]->clear_children();
-           children[0]->clear_user_pointer();
-           children[1]->clear_user_pointer();
+           children[0]->clear_user_data();
+           children[1]->clear_user_data();
            children[0]->clear_user_flag();
            children[1]->clear_user_flag();
 
@@ -5601,7 +5601,7 @@ Triangulation<2>::execute_refinement ()
              {
                new_lines[l]->set_used_flag();
                new_lines[l]->clear_user_flag();
-               new_lines[l]->clear_user_pointer();
+               new_lines[l]->clear_user_data();
                new_lines[l]->clear_children();
                                                 // interior line
                new_lines[l]->set_boundary_indicator(255);
@@ -5657,7 +5657,7 @@ Triangulation<2>::execute_refinement ()
              {
                subcells[i]->set_used_flag();
                subcells[i]->clear_user_flag();
-               subcells[i]->clear_user_pointer();
+               subcells[i]->clear_user_data();
                subcells[i]->clear_children();
                                                 // inherit material
                                                 // properties          
@@ -6166,8 +6166,8 @@ Triangulation<3>::execute_refinement ()
            children[1]->set_used_flag();
            children[0]->clear_children();
            children[1]->clear_children();
-           children[0]->clear_user_pointer();
-           children[1]->clear_user_pointer();
+           children[0]->clear_user_data();
+           children[1]->clear_user_data();
            children[0]->clear_user_flag();
            children[1]->clear_user_flag();
 
@@ -6324,7 +6324,7 @@ Triangulation<3>::execute_refinement ()
              {
                new_lines[i]->set_used_flag();
                new_lines[i]->clear_user_flag();
-               new_lines[i]->clear_user_pointer();
+               new_lines[i]->clear_user_data();
                new_lines[i]->clear_children();
                new_lines[i]->set_boundary_indicator(quad->boundary_indicator());
              }
@@ -6425,7 +6425,7 @@ Triangulation<3>::execute_refinement ()
              {
                new_quads[i]->set_used_flag();
                new_quads[i]->clear_user_flag();
-               new_quads[i]->clear_user_pointer();
+               new_quads[i]->clear_user_data();
                new_quads[i]->clear_children();
                new_quads[i]->set_boundary_indicator (quad->boundary_indicator());
                                                 // set all line orientations to
@@ -6624,7 +6624,7 @@ Triangulation<3>::execute_refinement ()
              {
                new_lines[i]->set_used_flag();
                new_lines[i]->clear_user_flag();
-               new_lines[i]->clear_user_pointer();
+               new_lines[i]->clear_user_data();
                new_lines[i]->clear_children();
                                                 // interior line
                new_lines[i]->set_boundary_indicator(255);
@@ -6959,7 +6959,7 @@ Triangulation<3>::execute_refinement ()
              {
                new_quads[i]->set_used_flag();
                new_quads[i]->clear_user_flag();
-               new_quads[i]->clear_user_pointer();
+               new_quads[i]->clear_user_data();
                new_quads[i]->clear_children();
                                                 // interior quad
                new_quads[i]->set_boundary_indicator (255);
@@ -7190,7 +7190,7 @@ Triangulation<3>::execute_refinement ()
              {
                new_hexes[i]->set_used_flag();
                new_hexes[i]->clear_user_flag();
-               new_hexes[i]->clear_user_pointer();
+               new_hexes[i]->clear_user_data();
                new_hexes[i]->clear_children();
                                                 // inherit material
                                                 // properties
@@ -9063,7 +9063,7 @@ void Triangulation<1>::delete_children (cell_iterator &cell,
                                   // on...
   for (unsigned int child=0; child<GeometryInfo<dim>::children_per_cell; ++child)
     {
-      cell->child(child)->clear_user_pointer();
+      cell->child(child)->clear_user_data();
       cell->child(child)->clear_user_flag();
       cell->child(child)->clear_used_flag();
     }
@@ -9152,10 +9152,10 @@ void Triangulation<2>::delete_children (cell_iterator &cell,
                                   // clear user pointers, to avoid
                                   // that they may appear at unwanted
                                   // places later on...
-  cell->child(0)->line(1)->clear_user_pointer();
-  cell->child(0)->line(3)->clear_user_pointer();
-  cell->child(3)->line(0)->clear_user_pointer();
-  cell->child(3)->line(2)->clear_user_pointer();
+  cell->child(0)->line(1)->clear_user_data();
+  cell->child(0)->line(3)->clear_user_data();
+  cell->child(3)->line(0)->clear_user_data();
+  cell->child(3)->line(2)->clear_user_data();
   
                                   // same for user flags
   cell->child(0)->line(1)->clear_user_flag();
@@ -9187,7 +9187,7 @@ void Triangulation<2>::delete_children (cell_iterator &cell,
        for (unsigned int subface=0;
             subface<GeometryInfo<dim>::subfaces_per_face; ++subface)
          {
-           cell->face(face)->child(subface)->clear_user_pointer ();
+           cell->face(face)->child(subface)->clear_user_data ();
            cell->face(face)->child(subface)->clear_user_flag ();
            cell->face(face)->child(subface)->clear_used_flag ();
          }
@@ -9198,7 +9198,7 @@ void Triangulation<2>::delete_children (cell_iterator &cell,
                                   // invalidate children
   for (unsigned int child=0; child<GeometryInfo<dim>::children_per_cell; ++child)
     {
-      cell->child(child)->clear_user_pointer();
+      cell->child(child)->clear_user_data();
       cell->child(child)->clear_user_flag();
       cell->child(child)->clear_used_flag();
     }
@@ -9326,14 +9326,14 @@ void Triangulation<3>::delete_children (cell_iterator &cell,
                                   // delete thes quads and lines
   for (unsigned int q=0; q<12; ++q)
     {
-      interior_quads[q]->clear_user_pointer();
+      interior_quads[q]->clear_user_data();
       interior_quads[q]->clear_user_flag();
       interior_quads[q]->clear_used_flag();
     }
 
   for (unsigned int l=0; l<6; ++l)
     {
-      interior_lines[l]->clear_user_pointer();
+      interior_lines[l]->clear_user_data();
       interior_lines[l]->clear_user_flag();
       interior_lines[l]->clear_used_flag();
     }
@@ -9365,7 +9365,7 @@ void Triangulation<3>::delete_children (cell_iterator &cell,
                                         // delete interior lines
        for (unsigned int l=0; l<4; ++l)
          {
-           interior_lines[l]->clear_user_pointer ();
+           interior_lines[l]->clear_user_data ();
            interior_lines[l]->clear_user_flag ();
            interior_lines[l]->clear_used_flag ();
          }
@@ -9374,7 +9374,7 @@ void Triangulation<3>::delete_children (cell_iterator &cell,
        for (unsigned int subface=0;
             subface<GeometryInfo<dim>::subfaces_per_face; ++subface)
          {
-           quad->child(subface)->clear_user_pointer ();
+           quad->child(subface)->clear_user_data ();
            quad->child(subface)->clear_user_flag ();
            quad->child(subface)->clear_used_flag ();
          }
@@ -9385,7 +9385,7 @@ void Triangulation<3>::delete_children (cell_iterator &cell,
                                   // invalidate children
   for (unsigned int child=0; child<GeometryInfo<dim>::children_per_cell; ++child)
     {
-      cell->child(child)->clear_user_pointer();
+      cell->child(child)->clear_user_data();
       cell->child(child)->clear_user_flag();
 
       for (unsigned int f=0; f<GeometryInfo<dim>::faces_per_cell; ++f)
@@ -9453,7 +9453,7 @@ void Triangulation<3>::delete_children (cell_iterator &cell,
                
          for (unsigned int child=0; child<2; ++child)
            {
-             line->child(child)->clear_user_pointer();
+             line->child(child)->clear_user_data();
              line->child(child)->clear_user_flag();
              line->child(child)->clear_used_flag();
            }

diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc
index 49a1f469827ec562623f4b93d033497ec0ce21f6..8e30a4c6a84b7c091616285632750e4522aa9fd3 100644 (file)
--- a/deal.II/deal.II/source/grid/tria_accessor.cc
+++ b/deal.II/deal.II/source/grid/tria_accessor.cc
@@ -108,6 +108,15 @@ void TriaObjectAccessor<1, dim>::recursively_clear_user_flag () const
 
 
 
+template <int dim>
+void TriaObjectAccessor<1, dim>::clear_user_data () const
+{
+  Assert (used(), TriaAccessorExceptions::ExcCellNotUsed());
+  objects().clear_user_data(this->present_index);
+}
+
+
+
 template <int dim>
 void TriaObjectAccessor<1, dim>::set_user_pointer (void *p) const
 {
@@ -405,6 +414,15 @@ void TriaObjectAccessor<2, dim>::recursively_clear_user_flag () const
 
 
 
+template <int dim>
+void TriaObjectAccessor<2, dim>::clear_user_data () const
+{
+  Assert (used(), TriaAccessorExceptions::ExcCellNotUsed());
+  objects().clear_user_data(this->present_index);
+}
+
+
+
 template <int dim>
 void TriaObjectAccessor<2, dim>::set_user_pointer (void *p) const
 {
@@ -930,6 +948,15 @@ void TriaObjectAccessor<3, dim>::recursively_clear_user_flag () const
 
 #if deal_II_dimension == 3
 
+template <>
+void TriaObjectAccessor<3, 3>::clear_user_data () const
+{
+  Assert (used(), TriaAccessorExceptions::ExcCellNotUsed());
+  this->tria->levels[this->present_level]->cells.clear_user_data(this->present_index);
+}
+
+
+
 template <>
 void TriaObjectAccessor<3, 3>::set_user_pointer (void *p) const
 {