Remove deprecated Gnuplot::n_boundary_face_points

diff --git a/include/deal.II/grid/grid_out.h b/include/deal.II/grid/grid_out.h
index 6af4b566b7de376f929b3e72e7c11a0a45830c7f..ca4be9de6b14edf6d3064bcfbb1866e03af7111b 100644 (file)
--- a/include/deal.II/grid/grid_out.h
+++ b/include/deal.II/grid/grid_out.h
@@ -252,18 +252,6 @@ namespace GridOutFlags
      */
     unsigned int n_extra_curved_line_points;
 
-    /**
-     * Based on the vertices of the face and #n_boundary_face_points
-     * additional points a tensor product mesh (transformed to the real space)
-     * of (#n_boundary_face_points+2)<sup>dim-1</sup> points is plotted on
-     * each boundary face.
-     *
-     * @deprecated Use n_extra_curved_line_points instead, which has
-     * a more precise name. For compatibility this is implemented as a
-     * reference to n_extra_curved_line_points.
-     */
-    DEAL_II_DEPRECATED unsigned int &n_boundary_face_points;
-
     /**
      * Boolean indicating whether or not interior lines should be plotted with
      * <tt>n_extra_curved_line_points</tt> line segments.

diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc
index cacec43d384b4298b6dadcbdf65798332274ff74..af32079930ea55527b5b65951520ce88d59e2532 100644 (file)
--- a/source/grid/grid_out.cc
+++ b/source/grid/grid_out.cc
@@ -153,7 +153,6 @@ namespace GridOutFlags
                    const bool         write_additional_boundary_lines)
     : write_cell_numbers(write_cell_numbers)
     , n_extra_curved_line_points(n_extra_curved_line_points)
-    , n_boundary_face_points(this->n_extra_curved_line_points)
     , curved_inner_cells(curved_inner_cells)
     , write_additional_boundary_lines(write_additional_boundary_lines)
   {}
@@ -194,8 +193,8 @@ namespace GridOutFlags
   void
   Gnuplot::parse_parameters(ParameterHandler &param)
   {
-    write_cell_numbers     = param.get_bool("Cell number");
-    n_boundary_face_points = param.get_integer("Boundary points");
+    write_cell_numbers         = param.get_bool("Cell number");
+    n_extra_curved_line_points = param.get_integer("Boundary points");
   }
 
 
@@ -4029,7 +4028,7 @@ namespace internal
       const int dim = 2;
 
       const unsigned int n_additional_points =
-        gnuplot_flags.n_boundary_face_points;
+        gnuplot_flags.n_extra_curved_line_points;
       const unsigned int n_points = 2 + n_additional_points;
 
       // If we need to plot curved lines then generate a quadrature formula to
@@ -4140,7 +4139,7 @@ namespace internal
       const int dim = 3;
 
       const unsigned int n_additional_points =
-        gnuplot_flags.n_boundary_face_points;
+        gnuplot_flags.n_extra_curved_line_points;
       const unsigned int n_points = 2 + n_additional_points;
 
       // If we need to plot curved lines then generate a quadrature formula to

diff --git a/tests/grid/grid_out_gnuplot_01.cc b/tests/grid/grid_out_gnuplot_01.cc
index 6ba959e30072c91ba05f1be6f539f11805a343c5..e2e53391e71929556eca632772464a74c075f825 100644 (file)
--- a/tests/grid/grid_out_gnuplot_01.cc
+++ b/tests/grid/grid_out_gnuplot_01.cc
@@ -85,11 +85,7 @@ main()
   {
     deallog << "don't curve anything" << std::endl;
     GridOutFlags::Gnuplot flags;
-    // check that this really is a reference for the real name
-    flags.n_boundary_face_points = 42;
-    Assert(flags.n_extra_curved_line_points == 42, ExcInternalError());
     flags.n_extra_curved_line_points = 0;
-    Assert(flags.n_boundary_face_points == 0, ExcInternalError());
 
     flags.curved_inner_cells              = false;
     flags.write_additional_boundary_lines = false;

diff --git a/tests/numerics/no_flux_10.cc b/tests/numerics/no_flux_10.cc
index fa3c53f59b7ad164bce74f0c217a3acd1deb46dd..8fdd44f7c3ed24159f3d0b26a8ae39ba9d22e59f 100644 (file)
--- a/tests/numerics/no_flux_10.cc
+++ b/tests/numerics/no_flux_10.cc
@@ -216,7 +216,7 @@ run()
   MappingQ<3>           m(4);
   GridOut               go;
   GridOutFlags::Gnuplot gof;
-  gof.n_boundary_face_points = 6;
+  gof.n_extra_curved_line_points = 6;
   go.set_flags(gof);
   go.write_gnuplot(triangulation, deallog.get_file_stream(), &m);