From 6d0f2e326c1e43417ed4dc151a905b8cb5a5b3f5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 29 Dec 2014 20:20:54 -0600 Subject: [PATCH] Remove deprecated function DataPostprocessor::compute_derived_quantities_*. --- include/deal.II/numerics/data_postprocessor.h | 40 ++----------------- source/numerics/data_postprocessor.cc | 31 +------------- 2 files changed, 5 insertions(+), 66 deletions(-) diff --git a/include/deal.II/numerics/data_postprocessor.h b/include/deal.II/numerics/data_postprocessor.h index cc4e2b86c7..5d609e0e3d 100644 --- 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 &uh, - const std::vector > &duh, - const std::vector > &dduh, - const std::vector > &normals, - std::vector > &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 > &evaluation_points, std::vector > &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 > &uh, - const std::vector > > &duh, - const std::vector > > &dduh, - const std::vector > &normals, - std::vector > &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 22b4b97d6e..f62778ab5d 100644 --- a/source/numerics/data_postprocessor.cc +++ b/source/numerics/data_postprocessor.cc @@ -27,20 +27,6 @@ DataPostprocessor::~DataPostprocessor() -template -void -DataPostprocessor:: -compute_derived_quantities_scalar (const std::vector &/*uh*/, - const std::vector > &/*duh*/, - const std::vector > &/*dduh*/, - const std::vector > &/*normals*/, - std::vector > &computed_quantities) const -{ - computed_quantities.clear(); - AssertThrow(false,ExcPureFunctionCalled()); -} - - template void DataPostprocessor:: @@ -50,20 +36,6 @@ compute_derived_quantities_scalar (const std::vector &uh, const std::vector > &normals, const std::vector > &/*evaluation_points*/, std::vector > &computed_quantities) const -{ - compute_derived_quantities_scalar(uh, duh, dduh, normals, computed_quantities); -} - - - -template -void -DataPostprocessor:: -compute_derived_quantities_vector (const std::vector > &/*uh*/, - const std::vector > > &/*duh*/, - const std::vector > > &/*dduh*/, - const std::vector > &/*normals*/, - std::vector > &computed_quantities) const { computed_quantities.clear(); AssertThrow(false,ExcPureFunctionCalled()); @@ -81,7 +53,8 @@ compute_derived_quantities_vector (const std::vector > &uh, const std::vector > &/*evaluation_points*/, std::vector > &computed_quantities) const { - compute_derived_quantities_vector(uh, duh, dduh, normals, computed_quantities); + computed_quantities.clear(); + AssertThrow(false,ExcPureFunctionCalled()); } -- 2.39.5