From 38945399a560c7a6de980d4407a2a91a8a13f23d Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 2 Jan 2015 13:06:55 -0600 Subject: [PATCH] Remove deprecated function DataOutBase::write_hdf5_parallel. --- doc/news/changes.h | 1 + include/deal.II/base/data_out_base.h | 16 ++++++---------- source/base/data_out_base.cc | 15 +++++++-------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 4df445fbee..8f96e3cb8a 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -59,6 +59,7 @@ inconvenience this causes. - The version of GridGenerator::parallelogram where the corners are given as a rank-2 tensor rather than as an array of points. - DataOutBase::create_xdmf_entry with 3 arguments. + - DataOutBase::write_hdf5_parallel with 2 arguments. - Algorithms::ThetaTimestepping::operator(). - Algorithms::ThetaTimestepping::initialize. - Algorithms::Newton::initialize. diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h index 6441fce9aa..308f2e692a 100644 --- a/include/deal.II/base/data_out_base.h +++ b/include/deal.II/base/data_out_base.h @@ -2363,14 +2363,6 @@ public: const std::string &filename, MPI_Comm comm) const; - /** - * Write the data in this class without redundancy filtering to a single - * HDF5 file containing both the mesh and solution values. - * @deprecated: use write_hdf5_parallel(DataOutFilter, ...) instead - */ - void write_hdf5_parallel (const std::string &filename, - MPI_Comm comm) const DEAL_II_DEPRECATED; - /** * Write the data in data_filter to a single HDF5 file containing both the * mesh and solution values. Below is an example of how to use this function @@ -2385,7 +2377,8 @@ public: * @endcode */ void write_hdf5_parallel (const DataOutBase::DataOutFilter &data_filter, - const std::string &filename, MPI_Comm comm) const; + const std::string &filename, + MPI_Comm comm) const; /** * Write the data in data_filter to HDF5 file(s). If write_mesh_file is @@ -2395,7 +2388,10 @@ public: * and solution values. */ void write_hdf5_parallel (const DataOutBase::DataOutFilter &data_filter, - const bool write_mesh_file, const std::string &mesh_filename, const std::string &solution_filename, MPI_Comm comm) const; + const bool write_mesh_file, + const std::string &mesh_filename, + const std::string &solution_filename, + MPI_Comm comm) const; /** * DataOutFilter is an intermediate data format that reduces the amount of diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index 1802763072..fde2d4eb7a 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -7143,14 +7143,7 @@ void DataOutBase::write_filtered_data (const std::vector > & } } -template -void DataOutInterface:: -write_hdf5_parallel (const std::string &filename, MPI_Comm comm) const -{ - DataOutBase::DataOutFilter data_filter(DataOutBase::DataOutFilterFlags(false, true)); - write_filtered_data(data_filter); - write_hdf5_parallel(data_filter, filename, comm); -} + template void DataOutInterface:: @@ -7160,6 +7153,8 @@ write_hdf5_parallel (const DataOutBase::DataOutFilter &data_filter, DataOutBase::write_hdf5_parallel(get_patches(), data_filter, filename, comm); } + + template void DataOutInterface:: write_hdf5_parallel (const DataOutBase::DataOutFilter &data_filter, @@ -7168,6 +7163,8 @@ write_hdf5_parallel (const DataOutBase::DataOutFilter &data_filter, DataOutBase::write_hdf5_parallel(get_patches(), data_filter, write_mesh_file, mesh_filename, solution_filename, comm); } + + template void DataOutBase::write_hdf5_parallel (const std::vector > &patches, const DataOutBase::DataOutFilter &data_filter, @@ -7177,6 +7174,8 @@ void DataOutBase::write_hdf5_parallel (const std::vector > & write_hdf5_parallel(patches, data_filter, true, filename, filename, comm); } + + template void DataOutBase::write_hdf5_parallel (const std::vector > &patches, const DataOutBase::DataOutFilter &data_filter, -- 2.39.5