From b3d1d28caf94936c6d5ef1a94ed9b82c0ed8f002 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 29 Dec 2014 19:57:27 -0600 Subject: [PATCH] Remove deprecated function PointValueHistory::mark_locations(). --- include/deal.II/numerics/point_value_history.h | 12 ------------ source/numerics/point_value_history.cc | 8 -------- tests/deal.II/point_value_history_01.cc | 6 +++--- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/include/deal.II/numerics/point_value_history.h b/include/deal.II/numerics/point_value_history.h index f698a997e1..dac6fb6ee0 100644 --- a/include/deal.II/numerics/point_value_history.h +++ b/include/deal.II/numerics/point_value_history.h @@ -446,18 +446,6 @@ public: */ Vector mark_support_locations(); - - /** - * @deprecated - * - * This function only exists for backward compatibility as this is the - * interface provided by previous versions of the library. The function - * mark_support_locations replaces it and reflects the fact that the - * locations marked are actually the support points. - */ - Vector mark_locations() DEAL_II_DEPRECATED; - - /** * Stores the actual location of each support point selected by the @p * add_point(s) method. This can be used to compare with the point diff --git a/source/numerics/point_value_history.cc b/source/numerics/point_value_history.cc index 3d38533795..da6944ba5b 100644 --- a/source/numerics/point_value_history.cc +++ b/source/numerics/point_value_history.cc @@ -1073,14 +1073,6 @@ Vector PointValueHistory } -template -Vector PointValueHistory -::mark_locations () -{ - return mark_support_locations (); -} - - template void PointValueHistory ::get_support_locations (std::vector > > &locations) diff --git a/tests/deal.II/point_value_history_01.cc b/tests/deal.II/point_value_history_01.cc index d0fefa4b17..32be72f520 100644 --- a/tests/deal.II/point_value_history_01.cc +++ b/tests/deal.II/point_value_history_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2009 - 2013 by the deal.II authors +// Copyright (C) 2009 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -156,7 +156,7 @@ void TestPointValueHistory::run() test_copy.add_field_name("Solution"); std::vector < std::vector > > selected_locations; test_copy.get_points(selected_locations); - test_copy.mark_locations(); + test_copy.mark_support_locations(); test_copy.close(); test_copy.start_new_dataset(0.1); test_copy.evaluate_field("Solution", solution); @@ -191,7 +191,7 @@ void TestPointValueHistory::run() std::vector < std::vector > > selected_locations; node_monitor.get_points(selected_locations); // write output to a file - Vector node_locations = node_monitor.mark_locations(); + Vector node_locations = node_monitor.mark_support_locations(); // write output to a file } -- 2.39.5