Remove deprecated function DataPostprocessor::compute_derived_quantities_*.

diff --git a/include/deal.II/numerics/data_postprocessor.h b/include/deal.II/numerics/data_postprocessor.h
index cc4e2b86c7ac0673761443bd51ec60b426fbe30b..5d609e0e3d61b708460c951139fa40024d0de883 100644 (file)
--- a/include/deal.II/numerics/data_postprocessor.h
+++ b/include/deal.II/numerics/data_postprocessor.h
@@ -114,28 +114,12 @@ class DataPostprocessor: public Subscriptor
 {
 public:
   /**
-   * Virtual desctructor for safety. Does not do anything.
+   * Destructor. This function doesn't actually do anything but
+   * is marked as virtual to ensure that data postprocessors can
+   * be destroyed through pointers to the base class.
    */
   virtual ~DataPostprocessor ();
 
-  /**
-   * @deprecated
-   *
-   * This function only exists for backward compatibility as this is the
-   * interface provided by previous versions of the library. The default
-   * implementation of the other function of same name below calls this
-   * function by simply dropping the argument that denotes the evaluation
-   * points. Since this function might at one point go away, you should
-   * overload the other function instead.
-   */
-  virtual
-  void
-  compute_derived_quantities_scalar (const std::vector<double>         &uh,
-                                     const std::vector<Tensor<1,dim> > &duh,
-                                     const std::vector<Tensor<2,dim> > &dduh,
-                                     const std::vector<Point<dim> >    &normals,
-                                     std::vector<Vector<double> >      &computed_quantities) const DEAL_II_DEPRECATED;
-
   /**
    * This is the main function which actually performs the postprocessing. The
    * last argument is a reference to the postprocessed data which has correct
@@ -159,24 +143,6 @@ public:
                                      const std::vector<Point<dim> >    &evaluation_points,
                                      std::vector<Vector<double> >      &computed_quantities) const;
 
-  /**
-   * @deprecated
-   *
-   * This function only exists for backward compatibility as this is the
-   * interface provided by previous versions of the library. The default
-   * implementation of the other function of same name below calls this
-   * function by simply dropping the argument that denotes the evaluation
-   * points. Since this function might at one point go away, you should
-   * overload the other function instead.
-   */
-  virtual
-  void
-  compute_derived_quantities_vector (const std::vector<Vector<double> >              &uh,
-                                     const std::vector<std::vector<Tensor<1,dim> > > &duh,
-                                     const std::vector<std::vector<Tensor<2,dim> > > &dduh,
-                                     const std::vector<Point<dim> >                  &normals,
-                                     std::vector<Vector<double> >                    &computed_quantities) const DEAL_II_DEPRECATED;
-
   /**
    * Same as the compute_derived_quantities_scalar() function, but this
    * function is called when the original data vector represents vector data,

diff --git a/source/numerics/data_postprocessor.cc b/source/numerics/data_postprocessor.cc
index 22b4b97d6e34e2b43c662ae8a0c7251910566565..f62778ab5d7cfb3ad769fe56f5f37ef4156dae53 100644 (file)
--- a/source/numerics/data_postprocessor.cc
+++ b/source/numerics/data_postprocessor.cc
@@ -27,20 +27,6 @@ DataPostprocessor<dim>::~DataPostprocessor()
 
 
 
-template <int dim>
-void
-DataPostprocessor<dim>::
-compute_derived_quantities_scalar (const std::vector<double>         &/*uh*/,
-                                   const std::vector<Tensor<1,dim> > &/*duh*/,
-                                   const std::vector<Tensor<2,dim> > &/*dduh*/,
-                                   const std::vector<Point<dim> >    &/*normals*/,
-                                   std::vector<Vector<double> >      &computed_quantities) const
-{
-  computed_quantities.clear();
-  AssertThrow(false,ExcPureFunctionCalled());
-}
-
-
 template <int dim>
 void
 DataPostprocessor<dim>::
@@ -50,20 +36,6 @@ compute_derived_quantities_scalar (const std::vector<double>         &uh,
                                    const std::vector<Point<dim> >    &normals,
                                    const std::vector<Point<dim> >    &/*evaluation_points*/,
                                    std::vector<Vector<double> >      &computed_quantities) const
-{
-  compute_derived_quantities_scalar(uh, duh, dduh, normals, computed_quantities);
-}
-
-
-
-template <int dim>
-void
-DataPostprocessor<dim>::
-compute_derived_quantities_vector (const std::vector<Vector<double> > &/*uh*/,
-                                   const std::vector<std::vector<Tensor<1,dim> > > &/*duh*/,
-                                   const std::vector<std::vector<Tensor<2,dim> > > &/*dduh*/,
-                                   const std::vector<Point<dim> >                  &/*normals*/,
-                                   std::vector<Vector<double> >                    &computed_quantities) const
 {
   computed_quantities.clear();
   AssertThrow(false,ExcPureFunctionCalled());
@@ -81,7 +53,8 @@ compute_derived_quantities_vector (const std::vector<Vector<double> > &uh,
                                    const std::vector<Point<dim> >                  &/*evaluation_points*/,
                                    std::vector<Vector<double> >                    &computed_quantities) const
 {
-  compute_derived_quantities_vector(uh, duh, dduh, normals, computed_quantities);
+  computed_quantities.clear();
+  AssertThrow(false,ExcPureFunctionCalled());
 }