From 7f968cb95f97fdcb8ee08b6a4f334e4a3667630f Mon Sep 17 00:00:00 2001 From: Daniel Garcia-Sanchez Date: Fri, 2 Nov 2018 13:30:39 +0100 Subject: [PATCH] Rename group() to open_group() --- include/deal.II/base/hdf5.h | 4 ++-- source/base/hdf5.cc | 2 +- tests/base/hdf5_01.cc | 2 +- tests/base/hdf5_02.cc | 2 +- tests/base/hdf5_03.cc | 2 +- tests/base/hdf5_04.cc | 2 +- tests/base/hdf5_05.cc | 2 +- tests/base/hdf5_06.cc | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/deal.II/base/hdf5.h b/include/deal.II/base/hdf5.h index d95b09b3dd..05810a0fd2 100644 --- a/include/deal.II/base/hdf5.h +++ b/include/deal.II/base/hdf5.h @@ -935,7 +935,7 @@ namespace HDF5 * This constructor creates or opens a group depending on the value of * @p mode. The group will be placed insided the group @p parent_group. The * parameter @p mpi defines if the the I/O operations are serial or - * parallel. This is an internal constructor, the functions group() and + * parallel. This is an internal constructor, the functions open_group() and * create_group() should be used to open or create a group. */ Group(const std::string & name, @@ -955,7 +955,7 @@ namespace HDF5 * Opens a group. */ Group - group(const std::string &name); + open_group(const std::string &name); /** * Creates a group. diff --git a/source/base/hdf5.cc b/source/base/hdf5.cc index db8f358137..073b91189c 100644 --- a/source/base/hdf5.cc +++ b/source/base/hdf5.cc @@ -1489,7 +1489,7 @@ namespace HDF5 Group - Group::group(const std::string &name) + Group::open_group(const std::string &name) { return Group(name, *this, mpi, GroupAccessMode::open); } diff --git a/tests/base/hdf5_01.cc b/tests/base/hdf5_01.cc index 15778f179d..f1ab88dc97 100644 --- a/tests/base/hdf5_01.cc +++ b/tests/base/hdf5_01.cc @@ -87,7 +87,7 @@ test() << data_file.get_attribute("root_total") << std::endl; // Read attributes attached to a group - auto test_group = data_file.group("test_group"); + auto test_group = data_file.open_group("test_group"); #ifdef DEAL_II_WITH_COMPLEX_VALUES auto group_complex_float = diff --git a/tests/base/hdf5_02.cc b/tests/base/hdf5_02.cc index 80df31b075..c5d2618449 100644 --- a/tests/base/hdf5_02.cc +++ b/tests/base/hdf5_02.cc @@ -91,7 +91,7 @@ test() << data_file.get_attribute("root_total") << std::endl; // Read attributes attached to a group - auto test_group = data_file.group("test_group"); + auto test_group = data_file.open_group("test_group"); #ifdef DEAL_II_WITH_COMPLEX_VALUES auto group_complex_float = diff --git a/tests/base/hdf5_03.cc b/tests/base/hdf5_03.cc index 25a5196c5f..190f48da7f 100644 --- a/tests/base/hdf5_03.cc +++ b/tests/base/hdf5_03.cc @@ -530,7 +530,7 @@ read_test(HDF5::Group root_group, deallog << "Read tests for " << container_name << "<" << type_name << ">" << " datasets" << std::endl; - auto group = root_group.group(container_name + "<" + type_name + ">"); + auto group = root_group.open_group(container_name + "<" + type_name + ">"); { std::string dataset_name("dataset_1"); diff --git a/tests/base/hdf5_04.cc b/tests/base/hdf5_04.cc index 2dd9c06761..d7e2a2d302 100644 --- a/tests/base/hdf5_04.cc +++ b/tests/base/hdf5_04.cc @@ -484,7 +484,7 @@ read_test(HDF5::Group root_group) deallog << "Read tests for " << container_name << "<" << type_name << ">" << " datasets" << std::endl; - auto group = root_group.group(container_name + "<" + type_name + ">"); + auto group = root_group.open_group(container_name + "<" + type_name + ">"); { std::string dataset_name("dataset_1"); diff --git a/tests/base/hdf5_05.cc b/tests/base/hdf5_05.cc index 76f3658a3d..f49d1537fc 100644 --- a/tests/base/hdf5_05.cc +++ b/tests/base/hdf5_05.cc @@ -851,7 +851,7 @@ read_test(HDF5::Group root_group, deallog << "Read tests for " << type_name << " datasets" << std::endl; - auto group = root_group.group(type_name); + auto group = root_group.open_group(type_name); { std::string dataset_name("dataset_1"); diff --git a/tests/base/hdf5_06.cc b/tests/base/hdf5_06.cc index 8bde20374a..a9c7223021 100644 --- a/tests/base/hdf5_06.cc +++ b/tests/base/hdf5_06.cc @@ -762,7 +762,7 @@ read_test(HDF5::Group root_group) deallog << "Read tests for " << type_name << " datasets" << std::endl; - auto group = root_group.group(type_name); + auto group = root_group.open_group(type_name); { std::string dataset_name("dataset_1"); -- 2.39.5