Remove deprecated functions in DataPostprocessor.

diff --git a/include/deal.II/numerics/data_postprocessor.h b/include/deal.II/numerics/data_postprocessor.h
index a9b76e85160db70bc857505e02e105aade2af1d5..c4b0be567ef74d01b934e4663a124c743a41bfb0 100644 (file)
--- a/include/deal.II/numerics/data_postprocessor.h
+++ b/include/deal.II/numerics/data_postprocessor.h
@@ -446,35 +446,6 @@ public:
   evaluate_scalar_field (const DataPostprocessorInputs::Scalar<dim> &input_data,
                          std::vector<Vector<double> >               &computed_quantities) const;
 
-  /**
-   * @deprecated This function is deprecated. It has been superseded by
-   * the evaluate_scalar_field() function that receives a superset of the
-   * information provided to the current function through the members
-   * of the structure it receives as the first argument.
-   *
-   * If a user class derived from the current class (or from
-   * DataPostprocessorScalar) does not overload the function above,
-   * but instead overloads the current (legacy) form of the function,
-   * then the default implementation of the function above will simply
-   * call the current function. However, not all elements of the
-   * DataPostprocessorInputs::Scalar argument the function above
-   * receives have corresponding function arguments in the current
-   * function, and consequently not all information that function has
-   * available is passed on to the current one. In other words, there
-   * are pieces of information you may need in an implementation of a
-   * postprocess that are available if you overload the new form of this
-   * function above, but that are not available if you overload the old
-   * form of the function here.
-   */
-  virtual
-  void
-  compute_derived_quantities_scalar (const std::vector<double>         &solution_values,
-                                     const std::vector<Tensor<1,dim> > &solution_gradients,
-                                     const std::vector<Tensor<2,dim> > &solution_hessians,
-                                     const std::vector<Point<dim> >    &normals,
-                                     const std::vector<Point<dim> >    &evaluation_points,
-                                     std::vector<Vector<double> >      &computed_quantities) const DEAL_II_DEPRECATED;
-
   /**
    * Same as the evaluate_scalar_field() function, but this
    * function is called when the original data vector represents vector data,
@@ -485,35 +456,6 @@ public:
   evaluate_vector_field (const DataPostprocessorInputs::Vector<dim> &input_data,
                          std::vector<Vector<double> >               &computed_quantities) const;
 
-  /**
-   * @deprecated This function is deprecated. It has been superseded by
-   * the evaluate_vector_field() function that receives a superset of the
-   * information provided to the current function through the members
-   * of the structure it receives as the first argument.
-   *
-   * If a user class derived from the current class (or from
-   * DataPostprocessorVector) does not overload the function above,
-   * but instead overloads the current (legacy) form of the function,
-   * then the default implementation of the function above will simply
-   * call the current function. However, not all elements of the
-   * DataPostprocessorInputs::Vector argument the function above
-   * receives have corresponding function arguments in the current
-   * function, and consequently not all information that function has
-   * available is passed on to the current one. In other words, there
-   * are pieces of information you may need in an implementation of a
-   * postprocess that are available if you overload the new form of this
-   * function above, but that are not available if you overload the old
-   * form of the function here.
-   */
-  virtual
-  void
-  compute_derived_quantities_vector (const std::vector<Vector<double> >              &solution_values,
-                                     const std::vector<std::vector<Tensor<1,dim> > > &solution_gradients,
-                                     const std::vector<std::vector<Tensor<2,dim> > > &solution_hessians,
-                                     const std::vector<Point<dim> >                  &normals,
-                                     const std::vector<Point<dim> >                  &evaluation_points,
-                                     std::vector<Vector<double> >                    &computed_quantities) const DEAL_II_DEPRECATED;
-
   /**
    * Return the vector of strings describing the names of the computed
    * quantities.

diff --git a/source/numerics/data_postprocessor.cc b/source/numerics/data_postprocessor.cc
index 3c694ca80a32b40f3ddbd53babd31b324f57c6cd..45cf4c3480eedc69528b6ba0a22a8882426a31c2 100644 (file)
--- a/source/numerics/data_postprocessor.cc
+++ b/source/numerics/data_postprocessor.cc
@@ -30,35 +30,9 @@ DataPostprocessor<dim>::~DataPostprocessor()
 template <int dim>
 void
 DataPostprocessor<dim>::
-evaluate_scalar_field (const DataPostprocessorInputs::Scalar<dim> &inputs,
-                       std::vector<Vector<double> >               &computed_quantities) const
+evaluate_scalar_field (const DataPostprocessorInputs::Scalar<dim> &,
+                       std::vector<Vector<double> > &) const
 {
-  // for backward compatibility, call the old function.
-  // this also requires converting the accidental use
-  // of Point<dim> for normal vectors
-  std::vector<Point<dim> > normals (inputs.normals.begin(),
-                                    inputs.normals.end());
-  compute_derived_quantities_scalar(inputs.solution_values,
-                                    inputs.solution_gradients,
-                                    inputs.solution_hessians,
-                                    normals,
-                                    inputs.evaluation_points,
-                                    computed_quantities);
-}
-
-
-
-template <int dim>
-void
-DataPostprocessor<dim>::
-compute_derived_quantities_scalar (const std::vector<double>         &/*solution_values*/,
-                                   const std::vector<Tensor<1,dim> > &/*solution_gradients*/,
-                                   const std::vector<Tensor<2,dim> > &/*solution_hessians*/,
-                                   const std::vector<Point<dim> >    &/*normals*/,
-                                   const std::vector<Point<dim> >    &/*evaluation_points*/,
-                                   std::vector<Vector<double> >      &computed_quantities) const
-{
-  computed_quantities.clear();
   AssertThrow(false,ExcPureFunctionCalled());
 }
 
@@ -67,35 +41,9 @@ compute_derived_quantities_scalar (const std::vector<double>         &/*solution
 template <int dim>
 void
 DataPostprocessor<dim>::
-evaluate_vector_field (const DataPostprocessorInputs::Vector<dim> &inputs,
-                       std::vector<Vector<double> >               &computed_quantities) const
-{
-  // for backward compatibility, call the old function.
-  // this also requires converting the accidental use
-  // of Point<dim> for normal vectors
-  std::vector<Point<dim> > normals (inputs.normals.begin(),
-                                    inputs.normals.end());
-  compute_derived_quantities_vector(inputs.solution_values,
-                                    inputs.solution_gradients,
-                                    inputs.solution_hessians,
-                                    normals,
-                                    inputs.evaluation_points,
-                                    computed_quantities);
-}
-
-
-
-template <int dim>
-void
-DataPostprocessor<dim>::
-compute_derived_quantities_vector (const std::vector<Vector<double> > &/*solution_values*/,
-                                   const std::vector<std::vector<Tensor<1,dim> > > &/*solution_gradients*/,
-                                   const std::vector<std::vector<Tensor<2,dim> > > &/*solution_hessians*/,
-                                   const std::vector<Point<dim> >                  &/*normals*/,
-                                   const std::vector<Point<dim> >                  &/*evaluation_points*/,
-                                   std::vector<Vector<double> >                    &computed_quantities) const
+evaluate_vector_field (const DataPostprocessorInputs::Vector<dim> &,
+                       std::vector<Vector<double> > &) const
 {
-  computed_quantities.clear();
   AssertThrow(false,ExcPureFunctionCalled());
 }