From d9fad9fa023d2702df1677b8522f17536c74b5e7 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 27 Jun 2022 10:11:31 -0400 Subject: [PATCH] Remove deprecated XDMFEntry::get_xdmf_content --- .../changes/incompatibilities/20220627Arndt-1 | 4 +++ include/deal.II/base/data_out_base.h | 11 -------- source/base/data_out_base.cc | 26 ------------------- tests/data_out/data_out_hdf5_02.cc | 2 +- tests/mpi/data_out_hdf5_02.cc | 2 +- tests/serialization/xdmf_entry.cc | 6 +++-- 6 files changed, 10 insertions(+), 41 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20220627Arndt-1 diff --git a/doc/news/changes/incompatibilities/20220627Arndt-1 b/doc/news/changes/incompatibilities/20220627Arndt-1 new file mode 100644 index 0000000000..68a5b163fe --- /dev/null +++ b/doc/news/changes/incompatibilities/20220627Arndt-1 @@ -0,0 +1,4 @@ +Removed: The deprecated overload of XDMFEntry::get_xdmf_content() +has been removed. +
+(Daniel Arndt, 2022/06/27) diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h index dc35266b27..96737d245e 100644 --- a/include/deal.II/base/data_out_base.h +++ b/include/deal.II/base/data_out_base.h @@ -3369,17 +3369,6 @@ public: &num_cells &dimension &space_dimension &attribute_dims; } - /** - * Get the XDMF content associated with this entry. - * If the entry is not valid, this returns an empty string. - * - * @deprecated Use the overload taking an `unsigned int` and a - * `const ReferenceCell &` instead. - */ - DEAL_II_DEPRECATED - std::string - get_xdmf_content(const unsigned int indent_level) const; - /** * Get the XDMF content associated with this entry. * If the entry is not valid, this returns an empty string. diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index 41bb8954cf..3c2c15d92e 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -9199,32 +9199,6 @@ namespace -std::string -XDMFEntry::get_xdmf_content(const unsigned int indent_level) const -{ - switch (dimension) - { - case 0: - return get_xdmf_content(indent_level, - ReferenceCells::get_hypercube<0>()); - case 1: - return get_xdmf_content(indent_level, - ReferenceCells::get_hypercube<1>()); - case 2: - return get_xdmf_content(indent_level, - ReferenceCells::get_hypercube<2>()); - case 3: - return get_xdmf_content(indent_level, - ReferenceCells::get_hypercube<3>()); - default: - Assert(false, ExcNotImplemented()); - } - - return ""; -} - - - std::string XDMFEntry::get_xdmf_content(const unsigned int indent_level, const ReferenceCell &reference_cell) const diff --git a/tests/data_out/data_out_hdf5_02.cc b/tests/data_out/data_out_hdf5_02.cc index f2c1cd6ad4..be2ce5b040 100644 --- a/tests/data_out/data_out_hdf5_02.cc +++ b/tests/data_out/data_out_hdf5_02.cc @@ -134,7 +134,7 @@ check() << " \n"; // Write out the entry - xdmf_file << entry.get_xdmf_content(3); + xdmf_file << entry.get_xdmf_content(3, ReferenceCells::get_hypercube()); xdmf_file << " \n"; xdmf_file << " \n"; diff --git a/tests/mpi/data_out_hdf5_02.cc b/tests/mpi/data_out_hdf5_02.cc index 05003706dd..04c84bcaa7 100644 --- a/tests/mpi/data_out_hdf5_02.cc +++ b/tests/mpi/data_out_hdf5_02.cc @@ -86,7 +86,7 @@ check() << " \n"; // Write out the entry - xdmf_file << entry.get_xdmf_content(3); + xdmf_file << entry.get_xdmf_content(3, ReferenceCells::get_hypercube()); xdmf_file << " \n"; xdmf_file << " \n"; diff --git a/tests/serialization/xdmf_entry.cc b/tests/serialization/xdmf_entry.cc index 2a3c3b5948..9dea0a6174 100644 --- a/tests/serialization/xdmf_entry.cc +++ b/tests/serialization/xdmf_entry.cc @@ -54,11 +54,13 @@ test() deallog << "XDMFEntry before serialization: " << std::endl << std::endl - << entry1.get_xdmf_content(0) << std::endl; + << entry1.get_xdmf_content(0, ReferenceCells::get_hypercube()) + << std::endl; deallog << "XDMFEntry after de-serialization: " << std::endl << std::endl - << entry2.get_xdmf_content(0) << std::endl; + << entry2.get_xdmf_content(0, ReferenceCells::get_hypercube()) + << std::endl; } -- 2.39.5