From fd35101a6e909260ba99618811914c14562589d9 Mon Sep 17 00:00:00 2001 From: Daniel Garcia-Sanchez Date: Mon, 29 Oct 2018 21:37:19 +0100 Subject: [PATCH] Rename dataset() to open_dataset() --- 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 | 8 ++++---- tests/base/hdf5_04.cc | 10 +++++----- tests/base/hdf5_05.cc | 12 ++++++------ 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/deal.II/base/hdf5.h b/include/deal.II/base/hdf5.h index 1c1de3405e..765562cb40 100644 --- a/include/deal.II/base/hdf5.h +++ b/include/deal.II/base/hdf5.h @@ -405,7 +405,7 @@ namespace HDF5 protected: /** * Open dataset. This is an internal constructor. The function - * Group::dataset() should be used to open a dataset. + * Group::open_dataset() should be used to open a dataset. */ DataSet(const std::string &name, const hid_t &parent_group_id, bool mpi); @@ -989,7 +989,7 @@ namespace HDF5 * Opens a dataset. */ DataSet - dataset(const std::string &name); + open_dataset(const std::string &name); /** * Creates a dataset. @p number can be `float`, `double`, diff --git a/source/base/hdf5.cc b/source/base/hdf5.cc index 3517b607a8..65e95fffae 100644 --- a/source/base/hdf5.cc +++ b/source/base/hdf5.cc @@ -1491,7 +1491,7 @@ namespace HDF5 DataSet - Group::dataset(const std::string &name) + Group::open_dataset(const std::string &name) { return DataSet(name, *hdf5_reference, mpi); } diff --git a/tests/base/hdf5_01.cc b/tests/base/hdf5_01.cc index 8c231337a1..f34534e176 100644 --- a/tests/base/hdf5_01.cc +++ b/tests/base/hdf5_01.cc @@ -107,7 +107,7 @@ test() << std::endl; // Read attributes attached to a dataset - auto test_dataset = test_group.dataset("test_dataset"); + auto test_dataset = test_group.open_dataset("test_dataset"); deallog << "dataset_double read:" << test_dataset.get_attribute("dataset_double") << std::endl; diff --git a/tests/base/hdf5_02.cc b/tests/base/hdf5_02.cc index b9620a96cb..2826454e17 100644 --- a/tests/base/hdf5_02.cc +++ b/tests/base/hdf5_02.cc @@ -107,7 +107,7 @@ test() << std::endl; // Read attributes attached to a dataset - auto test_dataset = test_group.dataset("test_dataset"); + auto test_dataset = test_group.open_dataset("test_dataset"); deallog << "dataset_double read:" << test_dataset.get_attribute("dataset_double") << std::endl; diff --git a/tests/base/hdf5_03.cc b/tests/base/hdf5_03.cc index 0de7770f7f..aa923aca43 100644 --- a/tests/base/hdf5_03.cc +++ b/tests/base/hdf5_03.cc @@ -534,7 +534,7 @@ read_test(HDF5::Group root_group, { std::string dataset_name("dataset_1"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" @@ -564,7 +564,7 @@ read_test(HDF5::Group root_group, { std::string dataset_name("dataset_2"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" @@ -628,7 +628,7 @@ read_test(HDF5::Group root_group, std::is_same::value) { std::string dataset_name("dataset_3"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" @@ -659,7 +659,7 @@ read_test(HDF5::Group root_group, { std::string dataset_name("dataset_4"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" diff --git a/tests/base/hdf5_04.cc b/tests/base/hdf5_04.cc index 7604669203..4b4b246b4d 100644 --- a/tests/base/hdf5_04.cc +++ b/tests/base/hdf5_04.cc @@ -488,7 +488,7 @@ read_test(HDF5::Group root_group) { std::string dataset_name("dataset_1"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" @@ -518,7 +518,7 @@ read_test(HDF5::Group root_group) { std::string dataset_name("dataset_2"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" @@ -582,7 +582,7 @@ read_test(HDF5::Group root_group) std::is_same::value) { std::string dataset_name("dataset_3"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" @@ -613,7 +613,7 @@ read_test(HDF5::Group root_group) { std::string dataset_name("dataset_4"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" @@ -689,7 +689,7 @@ read_test(HDF5::Group root_group) { std::string dataset_name("dataset_5"); - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << " " << container_name << "<" << type_name << ">" diff --git a/tests/base/hdf5_05.cc b/tests/base/hdf5_05.cc index a9fdfffcfe..3ad6e838b7 100644 --- a/tests/base/hdf5_05.cc +++ b/tests/base/hdf5_05.cc @@ -701,7 +701,7 @@ read_test(HDF5::Group root_group, // (3,0): 9, 10, 11, // (4,0): 12, 13, 14 - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << "<" << type_name << ">" << " (Read): " << dataset.get_dimensions() << std::endl; @@ -808,7 +808,7 @@ read_test(HDF5::Group root_group, // (0,3,0): 9, 10, 11, (1,3,0): 24, 25, 26, // (0,4,0): 12, 13, 14, (1,4,0): 27, 28, 29 - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << "<" << type_name << ">" << " (Read): " << dataset.get_dimensions() << std::endl; @@ -1002,7 +1002,7 @@ read_test(HDF5::Group root_group, // (0,3,0): 9, 10, 11, (1,3,0): 18, 20, 22, // (0,4,0): 12, 13, 14, (1,4,0): 24, 26, 28 - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << "<" << type_name << ">" << " (Read): " << dataset.get_dimensions() << std::endl; @@ -1041,7 +1041,7 @@ read_test(HDF5::Group root_group, // (2,0,0): 8, 9, 10, 11, // (2,1,0): 16, 18, 20, 22 - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << "<" << type_name << ">" << " (Read): " << dataset.get_dimensions() << std::endl; @@ -1081,7 +1081,7 @@ read_test(HDF5::Group root_group, // (2,1,0): 36, 35, 0, 33 - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << "<" << type_name << ">" << " (Read): " << dataset.get_dimensions() << std::endl; @@ -1122,7 +1122,7 @@ read_test(HDF5::Group root_group, // (6,0): -24, 40, 41, -25, 42, 43, -26, 44, 45, -27, 46, 47 - auto dataset = group.dataset(dataset_name); + auto dataset = group.open_dataset(dataset_name); dataset.set_query_io_mode(true); deallog << "Dimensions " + dataset_name << "<" << type_name << ">" << " (Read): " << dataset.get_dimensions() << std::endl; -- 2.39.5