Rename dataset() to open_dataset()

diff --git a/include/deal.II/base/hdf5.h b/include/deal.II/base/hdf5.h
index 1c1de3405e54879256635ba68a9f8da01c109173..765562cb40f98b1fbe2ed8d57603c73b06af7dd0 100644 (file)
--- 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 3517b607a85be6f3c5cb38d5983812bcf39e23e2..65e95fffaea398ec8a361088e0af9906672b13a1 100644 (file)
--- 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 8c231337a1bc31a89571bcd4924b7dd7d3746d4f..f34534e176fbdeeffc96732abcc07d1444e0d4a2 100644 (file)
--- 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<double>("dataset_double")
             << std::endl;

diff --git a/tests/base/hdf5_02.cc b/tests/base/hdf5_02.cc
index b9620a96cb13140b61fc30111fff41e2c05f2869..2826454e1728333d926980213462863aedd61514 100644 (file)
--- 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<double>("dataset_double")
             << std::endl;

diff --git a/tests/base/hdf5_03.cc b/tests/base/hdf5_03.cc
index 0de7770f7fc25a34256b0d6222ff12f1d55c80f6..aa923aca431d729fcf7d2c8dcf7b2ef9d31101f0 100644 (file)
--- 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<Number, double>::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 7604669203e4d7ca3b9ace11380e63a6f462a811..4b4b246b4d0d6375dab00c3c730148e229189162 100644 (file)
--- 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<Number, double>::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 a9fdfffcfe1ad6da01e6d34dd49892b826c51115..3ad6e838b7b3c575ed7a10655c713791dde13616 100644 (file)
--- 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;