From ca19dba9c2a5a52d664d0071b02aefafcc2b50e2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 24 Apr 2017 13:17:24 -0600 Subject: [PATCH] Remove deprecated functions in DataPostprocessor. --- include/deal.II/numerics/data_postprocessor.h | 58 ------------------ source/numerics/data_postprocessor.cc | 60 ++----------------- 2 files changed, 4 insertions(+), 114 deletions(-) diff --git a/include/deal.II/numerics/data_postprocessor.h b/include/deal.II/numerics/data_postprocessor.h index a9b76e8516..c4b0be567e 100644 --- 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 &input_data, std::vector > &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 &solution_values, - const std::vector > &solution_gradients, - const std::vector > &solution_hessians, - const std::vector > &normals, - const std::vector > &evaluation_points, - std::vector > &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 &input_data, std::vector > &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 > &solution_values, - const std::vector > > &solution_gradients, - const std::vector > > &solution_hessians, - const std::vector > &normals, - const std::vector > &evaluation_points, - std::vector > &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 3c694ca80a..45cf4c3480 100644 --- a/source/numerics/data_postprocessor.cc +++ b/source/numerics/data_postprocessor.cc @@ -30,35 +30,9 @@ DataPostprocessor::~DataPostprocessor() template void DataPostprocessor:: -evaluate_scalar_field (const DataPostprocessorInputs::Scalar &inputs, - std::vector > &computed_quantities) const +evaluate_scalar_field (const DataPostprocessorInputs::Scalar &, + std::vector > &) const { - // for backward compatibility, call the old function. - // this also requires converting the accidental use - // of Point for normal vectors - std::vector > 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 -void -DataPostprocessor:: -compute_derived_quantities_scalar (const std::vector &/*solution_values*/, - const std::vector > &/*solution_gradients*/, - const std::vector > &/*solution_hessians*/, - const std::vector > &/*normals*/, - const std::vector > &/*evaluation_points*/, - std::vector > &computed_quantities) const -{ - computed_quantities.clear(); AssertThrow(false,ExcPureFunctionCalled()); } @@ -67,35 +41,9 @@ compute_derived_quantities_scalar (const std::vector &/*solution template void DataPostprocessor:: -evaluate_vector_field (const DataPostprocessorInputs::Vector &inputs, - std::vector > &computed_quantities) const -{ - // for backward compatibility, call the old function. - // this also requires converting the accidental use - // of Point for normal vectors - std::vector > 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 -void -DataPostprocessor:: -compute_derived_quantities_vector (const std::vector > &/*solution_values*/, - const std::vector > > &/*solution_gradients*/, - const std::vector > > &/*solution_hessians*/, - const std::vector > &/*normals*/, - const std::vector > &/*evaluation_points*/, - std::vector > &computed_quantities) const +evaluate_vector_field (const DataPostprocessorInputs::Vector &, + std::vector > &) const { - computed_quantities.clear(); AssertThrow(false,ExcPureFunctionCalled()); } -- 2.39.5