]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Improve test for vertex_iterator. 1639/head
authorBruno Turcksin <bruno.turcksin@gmail.com>
Tue, 22 Sep 2015 16:10:06 +0000 (11:10 -0500)
committerBruno Turcksin <bruno.turcksin@gmail.com>
Tue, 22 Sep 2015 16:10:06 +0000 (11:10 -0500)
include/deal.II/grid/tria_accessor.h
include/deal.II/grid/tria_accessor.templates.h
tests/grid/vertex_iterator.cc
tests/grid/vertex_iterator.output

index 70f74cc865daf626f33f429380fe0779276b2954..ed642565f16aacec684e365c8268bec1885131bc 100644 (file)
@@ -632,7 +632,7 @@ public:
    * <code>dim=1</code>.
    */
   typename dealii::internal::Triangulation::Iterators<dim,spacedim>::vertex_iterator
-  vertex_it (const unsigned int i) const;
+  vertex_iterator (const unsigned int i) const;
 
   /**
    * Return the global index of i-th vertex of the current object. The
index 249d03edee89d1b4689008e58d992fd82f0ca04c..c316abc82b974ee69d89a9abbb675451df6ef5c5 100644 (file)
@@ -1163,7 +1163,7 @@ TriaAccessor<structdim,dim,spacedim>::used () const
 template <int structdim, int dim, int spacedim>
 inline
 typename dealii::internal::Triangulation::Iterators<dim,spacedim>::vertex_iterator
-TriaAccessor<structdim,dim,spacedim>::vertex_it (const unsigned int i) const
+TriaAccessor<structdim,dim,spacedim>::vertex_iterator (const unsigned int i) const
 {
   return typename dealii::internal::Triangulation::Iterators<dim,spacedim>::vertex_iterator
          (this->tria, 0, vertex_index (i));
@@ -2267,10 +2267,8 @@ TriaAccessor<0, dim, spacedim>::operator != (const TriaAccessor &t) const
 template <int dim, int spacedim>
 inline
 unsigned int
-TriaAccessor<0, dim, spacedim>::vertex_index (const unsigned int i) const
+TriaAccessor<0, dim, spacedim>::vertex_index (const unsigned int) const
 {
-  Assert(i==0, ExcIndexRange(i, 0, 1));
-  (void)i;
   return global_vertex_index;
 }
 
@@ -2279,10 +2277,8 @@ TriaAccessor<0, dim, spacedim>::vertex_index (const unsigned int i) const
 template <int dim, int spacedim>
 inline
 Point<spacedim> &
-TriaAccessor<0, dim, spacedim>::vertex (const unsigned int i) const
+TriaAccessor<0, dim, spacedim>::vertex (const unsigned int) const
 {
-  Assert(i==0, ExcIndexRange(i, 0, 1));
-  (void)i;
   return const_cast<Point<spacedim> &> (this->tria->vertices[global_vertex_index]);
 }
 
@@ -2343,9 +2339,8 @@ TriaAccessor<0, dim, spacedim>::diameter () const
 template <int dim, int spacedim>
 inline
 double
-TriaAccessor<0, dim, spacedim>::extent_in_direction (const unsigned int axis) const
+TriaAccessor<0, dim, spacedim>::extent_in_direction (const unsigned int) const
 {
-  (void) axis;
   return 0.;
 }
 
@@ -2354,12 +2349,9 @@ TriaAccessor<0, dim, spacedim>::extent_in_direction (const unsigned int axis) co
 template <int dim, int spacedim>
 inline
 Point<spacedim>
-TriaAccessor<0, dim, spacedim>::center (const bool respect_manifold,
-                                        const bool use_laplace_transformation) const
+TriaAccessor<0, dim, spacedim>::center (const bool,
+                                        const bool) const
 {
-  // Silence warning
-  (void) respect_manifold;
-  (void) use_laplace_transformation;
   return this->tria->vertices[global_vertex_index];
 }
 
index 4372685c825b2605c3473c2fee2f185a19281881..c9b6df4e310f7602da552305c48e35d806549ce3 100644 (file)
@@ -35,9 +35,19 @@ void test ()
   for (typename Triangulation<2>::active_cell_iterator
        cell = tria.begin_active(); cell != tria.end(); ++cell)
     {
-      for (unsigned int i = 0; i<4; ++i)
-        deallog << cell->vertex_it(i)->center() <<std::endl;
+      for (unsigned int i=0; i<4; ++i)
+        deallog << cell->vertex_iterator(i)->center() <<std::endl;
+      deallog << std::endl;
     }
+
+  for (typename Triangulation<2>::active_cell_iterator
+       cell = tria.begin_active(); cell != tria.end(); ++cell)
+    for (unsigned int i=0; i<4; ++i)
+      {
+        for (unsigned int j=0; j<2; ++j)
+          deallog << cell->line(i)->vertex_iterator(j)->center() <<std::endl;
+        deallog << std::endl;
+      }
 }
 
 
index 6d7733bace680536e2b98a1803580ac5c4250cc9..7631dad293599c387969af5f86ea7391738617a7 100644 (file)
@@ -3,63 +3,271 @@ DEAL::0.00000 0.00000
 DEAL::0.250000 0.00000
 DEAL::0.00000 0.250000
 DEAL::0.250000 0.250000
+DEAL::
 DEAL::0.250000 0.00000
 DEAL::0.500000 0.00000
 DEAL::0.250000 0.250000
 DEAL::0.500000 0.250000
+DEAL::
 DEAL::0.00000 0.250000
 DEAL::0.250000 0.250000
 DEAL::0.00000 0.500000
 DEAL::0.250000 0.500000
+DEAL::
 DEAL::0.250000 0.250000
 DEAL::0.500000 0.250000
 DEAL::0.250000 0.500000
 DEAL::0.500000 0.500000
+DEAL::
 DEAL::0.500000 0.00000
 DEAL::0.750000 0.00000
 DEAL::0.500000 0.250000
 DEAL::0.750000 0.250000
+DEAL::
 DEAL::0.750000 0.00000
 DEAL::1.00000 0.00000
 DEAL::0.750000 0.250000
 DEAL::1.00000 0.250000
+DEAL::
 DEAL::0.500000 0.250000
 DEAL::0.750000 0.250000
 DEAL::0.500000 0.500000
 DEAL::0.750000 0.500000
+DEAL::
 DEAL::0.750000 0.250000
 DEAL::1.00000 0.250000
 DEAL::0.750000 0.500000
 DEAL::1.00000 0.500000
+DEAL::
 DEAL::0.00000 0.500000
 DEAL::0.250000 0.500000
 DEAL::0.00000 0.750000
 DEAL::0.250000 0.750000
+DEAL::
 DEAL::0.250000 0.500000
 DEAL::0.500000 0.500000
 DEAL::0.250000 0.750000
 DEAL::0.500000 0.750000
+DEAL::
 DEAL::0.00000 0.750000
 DEAL::0.250000 0.750000
 DEAL::0.00000 1.00000
 DEAL::0.250000 1.00000
+DEAL::
 DEAL::0.250000 0.750000
 DEAL::0.500000 0.750000
 DEAL::0.250000 1.00000
 DEAL::0.500000 1.00000
+DEAL::
 DEAL::0.500000 0.500000
 DEAL::0.750000 0.500000
 DEAL::0.500000 0.750000
 DEAL::0.750000 0.750000
+DEAL::
 DEAL::0.750000 0.500000
 DEAL::1.00000 0.500000
 DEAL::0.750000 0.750000
 DEAL::1.00000 0.750000
+DEAL::
 DEAL::0.500000 0.750000
 DEAL::0.750000 0.750000
 DEAL::0.500000 1.00000
 DEAL::0.750000 1.00000
+DEAL::
 DEAL::0.750000 0.750000
 DEAL::1.00000 0.750000
 DEAL::0.750000 1.00000
 DEAL::1.00000 1.00000
+DEAL::
+DEAL::0.00000 0.00000
+DEAL::0.00000 0.250000
+DEAL::
+DEAL::0.250000 0.00000
+DEAL::0.250000 0.250000
+DEAL::
+DEAL::0.00000 0.00000
+DEAL::0.250000 0.00000
+DEAL::
+DEAL::0.00000 0.250000
+DEAL::0.250000 0.250000
+DEAL::
+DEAL::0.250000 0.00000
+DEAL::0.250000 0.250000
+DEAL::
+DEAL::0.500000 0.00000
+DEAL::0.500000 0.250000
+DEAL::
+DEAL::0.250000 0.00000
+DEAL::0.500000 0.00000
+DEAL::
+DEAL::0.250000 0.250000
+DEAL::0.500000 0.250000
+DEAL::
+DEAL::0.00000 0.250000
+DEAL::0.00000 0.500000
+DEAL::
+DEAL::0.250000 0.250000
+DEAL::0.250000 0.500000
+DEAL::
+DEAL::0.00000 0.250000
+DEAL::0.250000 0.250000
+DEAL::
+DEAL::0.00000 0.500000
+DEAL::0.250000 0.500000
+DEAL::
+DEAL::0.250000 0.250000
+DEAL::0.250000 0.500000
+DEAL::
+DEAL::0.500000 0.250000
+DEAL::0.500000 0.500000
+DEAL::
+DEAL::0.250000 0.250000
+DEAL::0.500000 0.250000
+DEAL::
+DEAL::0.250000 0.500000
+DEAL::0.500000 0.500000
+DEAL::
+DEAL::0.500000 0.00000
+DEAL::0.500000 0.250000
+DEAL::
+DEAL::0.750000 0.00000
+DEAL::0.750000 0.250000
+DEAL::
+DEAL::0.500000 0.00000
+DEAL::0.750000 0.00000
+DEAL::
+DEAL::0.500000 0.250000
+DEAL::0.750000 0.250000
+DEAL::
+DEAL::0.750000 0.00000
+DEAL::0.750000 0.250000
+DEAL::
+DEAL::1.00000 0.00000
+DEAL::1.00000 0.250000
+DEAL::
+DEAL::0.750000 0.00000
+DEAL::1.00000 0.00000
+DEAL::
+DEAL::0.750000 0.250000
+DEAL::1.00000 0.250000
+DEAL::
+DEAL::0.500000 0.250000
+DEAL::0.500000 0.500000
+DEAL::
+DEAL::0.750000 0.250000
+DEAL::0.750000 0.500000
+DEAL::
+DEAL::0.500000 0.250000
+DEAL::0.750000 0.250000
+DEAL::
+DEAL::0.500000 0.500000
+DEAL::0.750000 0.500000
+DEAL::
+DEAL::0.750000 0.250000
+DEAL::0.750000 0.500000
+DEAL::
+DEAL::1.00000 0.250000
+DEAL::1.00000 0.500000
+DEAL::
+DEAL::0.750000 0.250000
+DEAL::1.00000 0.250000
+DEAL::
+DEAL::0.750000 0.500000
+DEAL::1.00000 0.500000
+DEAL::
+DEAL::0.00000 0.500000
+DEAL::0.00000 0.750000
+DEAL::
+DEAL::0.250000 0.500000
+DEAL::0.250000 0.750000
+DEAL::
+DEAL::0.00000 0.500000
+DEAL::0.250000 0.500000
+DEAL::
+DEAL::0.00000 0.750000
+DEAL::0.250000 0.750000
+DEAL::
+DEAL::0.250000 0.500000
+DEAL::0.250000 0.750000
+DEAL::
+DEAL::0.500000 0.500000
+DEAL::0.500000 0.750000
+DEAL::
+DEAL::0.250000 0.500000
+DEAL::0.500000 0.500000
+DEAL::
+DEAL::0.250000 0.750000
+DEAL::0.500000 0.750000
+DEAL::
+DEAL::0.00000 0.750000
+DEAL::0.00000 1.00000
+DEAL::
+DEAL::0.250000 0.750000
+DEAL::0.250000 1.00000
+DEAL::
+DEAL::0.00000 0.750000
+DEAL::0.250000 0.750000
+DEAL::
+DEAL::0.00000 1.00000
+DEAL::0.250000 1.00000
+DEAL::
+DEAL::0.250000 0.750000
+DEAL::0.250000 1.00000
+DEAL::
+DEAL::0.500000 0.750000
+DEAL::0.500000 1.00000
+DEAL::
+DEAL::0.250000 0.750000
+DEAL::0.500000 0.750000
+DEAL::
+DEAL::0.250000 1.00000
+DEAL::0.500000 1.00000
+DEAL::
+DEAL::0.500000 0.500000
+DEAL::0.500000 0.750000
+DEAL::
+DEAL::0.750000 0.500000
+DEAL::0.750000 0.750000
+DEAL::
+DEAL::0.500000 0.500000
+DEAL::0.750000 0.500000
+DEAL::
+DEAL::0.500000 0.750000
+DEAL::0.750000 0.750000
+DEAL::
+DEAL::0.750000 0.500000
+DEAL::0.750000 0.750000
+DEAL::
+DEAL::1.00000 0.500000
+DEAL::1.00000 0.750000
+DEAL::
+DEAL::0.750000 0.500000
+DEAL::1.00000 0.500000
+DEAL::
+DEAL::0.750000 0.750000
+DEAL::1.00000 0.750000
+DEAL::
+DEAL::0.500000 0.750000
+DEAL::0.500000 1.00000
+DEAL::
+DEAL::0.750000 0.750000
+DEAL::0.750000 1.00000
+DEAL::
+DEAL::0.500000 0.750000
+DEAL::0.750000 0.750000
+DEAL::
+DEAL::0.500000 1.00000
+DEAL::0.750000 1.00000
+DEAL::
+DEAL::0.750000 0.750000
+DEAL::0.750000 1.00000
+DEAL::
+DEAL::1.00000 0.750000
+DEAL::1.00000 1.00000
+DEAL::
+DEAL::0.750000 0.750000
+DEAL::1.00000 0.750000
+DEAL::
+DEAL::0.750000 1.00000
+DEAL::1.00000 1.00000
+DEAL::

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.