Fix pyramid output in DataOutBase::write_gnuplot().

diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc
index df32f54bb86d2a70bd7ecf92a18c499cf03a173b..b1a7a278cf537992013bebd9cd063837170d9c41 100644 (file)
--- a/source/base/data_out_base.cc
+++ b/source/base/data_out_base.cc
@@ -3979,7 +3979,7 @@ namespace DataOutBase
                   {
                     Assert(n_subdivisions == 1, ExcNotImplemented());
 
-                    // Draw the tetrahedron as a two collections of lines.
+                    // Draw the tetrahedron as a collection of two lines.
                     for (const unsigned int v : {0, 1, 2, 0, 3, 2})
                       {
                         out << get_node_location(patch, v) << ' ';
@@ -4000,8 +4000,8 @@ namespace DataOutBase
                   {
                     Assert(n_subdivisions == 1, ExcNotImplemented());
 
-                    // Draw the pyramid as a two collections of lines.
-                    for (const unsigned int v : {0, 1, 2, 3, 0, 4, 1})
+                    // Draw the pyramid as a collection of two lines.
+                    for (const unsigned int v : {0, 1, 3, 2, 0, 4, 1})
                       {
                         out << get_node_location(patch, v) << ' ';
                         output_point_data(v);
@@ -4021,7 +4021,7 @@ namespace DataOutBase
                   {
                     Assert(n_subdivisions == 1, ExcNotImplemented());
 
-                    // Draw the wedge as three collections of
+                    // Draw the wedge as a collection of three
                     // lines. The first one wraps around the base,
                     // goes up to the top, and wraps around that. The
                     // second and third are just individual lines

diff --git a/tests/simplex/data_out_write_gnuplot_02.output b/tests/simplex/data_out_write_gnuplot_02.output
index a627d9d89ef0ced15fedda664f9c8456a4e010ad..63e60ae0b229973573f1bf4f87a2c2fe200058e3 100644 (file)
--- a/tests/simplex/data_out_write_gnuplot_02.output
+++ b/tests/simplex/data_out_write_gnuplot_02.output
@@ -8,8 +8,8 @@
 # <x> <y> <z> <solution> 
 -1.00000 -1.00000 0.00000 0.311111 
 1.00000 -1.00000 0.00000 0.311111 
-1.00000 1.00000 0.00000 0.311111 
 -1.00000 1.00000 0.00000 0.311111 
+1.00000 1.00000 0.00000 0.311111 
 -1.00000 -1.00000 0.00000 0.311111 
 0.00000 0.00000 1.00000 -0.133333 
 1.00000 -1.00000 0.00000 0.311111