Rename group() to open_group()

diff --git a/include/deal.II/base/hdf5.h b/include/deal.II/base/hdf5.h
index d95b09b3ddb61132675cf5d218146f25b5bca266..05810a0fd296fecfedf02880de2cdf47c593b6cc 100644 (file)
--- 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 db8f358137292d0cb8be2d55632630b701bc8b40..073b91189c6311308030c5694fc52803379ca53e 100644 (file)
--- 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 15778f179dbbdfde2332393b994f3633194492b0..f1ab88dc97e83f800b70917c618c34c5dac60278 100644 (file)
--- a/tests/base/hdf5_01.cc
+++ b/tests/base/hdf5_01.cc
@@ -87,7 +87,7 @@ test()
             << data_file.get_attribute<double>("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 80df31b075c19587381b6868b5365f6db68ab7b6..c5d2618449bc097c0ccc7d35978526f606e8fd11 100644 (file)
--- a/tests/base/hdf5_02.cc
+++ b/tests/base/hdf5_02.cc
@@ -91,7 +91,7 @@ test()
             << data_file.get_attribute<double>("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 25a5196c5f79713ee43df5b428045201682ba208..190f48da7fd2dd4e1a8a852ff94e0488223c22a5 100644 (file)
--- 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 2dd9c0676132e3aeec497a94e42b688a455cf8e1..d7e2a2d3023c1ce39bb4ab63c6d961ca7ceec9a6 100644 (file)
--- 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 76f3658a3dba567f84d7939eab8e10777513a1d2..f49d1537fcfa515daceac5b4ebb421f89aadac1c 100644 (file)
--- 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 8bde20374a2ded10119969e3d7aee3d4203aec15..a9c7223021892ff7eb0ac38c5840114ccb96600f 100644 (file)
--- 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");