Review fixes

Author: franzpoeschel

src/Iteration.cpp

@@ -256,8 +256,11 @@ bool Iteration::closedByWriter() const
 
 void Iteration::visitHierarchy(HierarchyVisitor &v, bool recursive)
 {
-    meshes.visitHierarchy(v, recursive);
-    particles.visitHierarchy(v, recursive);
+    if (recursive)
+    {
+        meshes.visitHierarchy(v, recursive);
+        particles.visitHierarchy(v, recursive);
+    }
     v(*this);
 }
 
@@ -534,8 +537,6 @@ void Iteration::read_impl(std::string const &groupPath)
     pOpen.path = groupPath;
     IOHandler()->enqueue(IOTask(this, pOpen));
 
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
-
     /* Find the root point [Series] of this file,
      * meshesPath and particlesPath are stored there */
     Series s = retrieveSeries();
@@ -598,6 +599,8 @@ void Iteration::read_impl(std::string const &groupPath)
     particles.setDirty(false);
 
     readAttributes(ReadMode::FullyReread);
+    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
+
 #ifdef openPMD_USE_INVASIVE_TESTS
     if (containsAttribute("__openPMD_internal_fail"))
     {

src/Mesh.cpp

@@ -498,8 +498,6 @@ void Mesh::read()
         IOHandler()->m_verify_homogeneous_extents);
     internal::EraseStaleEntries<Mesh> map{*this};
 
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
-
     if (scalar())
     {
         T_RecordComponent::read();
@@ -565,9 +563,8 @@ void Mesh::read()
 
     std::move(homogenizeExtents).homogenize(*this);
 
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
-
     readAttributes(ReadMode::FullyReread);
+    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
 }
 } // namespace openPMD
 

src/ParticleSpecies.cpp

@@ -29,8 +29,11 @@ namespace openPMD
 {
 void ParticleSpecies::visitHierarchy(HierarchyVisitor &v, bool recursive)
 {
+    if (recursive)
+    {
+        particlePatches.visitHierarchy(v, recursive);
+    }
     visitHierarchyImpl<ParticleSpecies>(v, recursive);
-    particlePatches.visitHierarchy(v, recursive);
 }
 
 ParticleSpecies::ParticleSpecies()

src/Record.cpp

@@ -197,9 +197,9 @@ auto Record::read() -> internal::HomogenizeExtents
         }
     }
 
+    readAttributes(ReadMode::FullyReread);
     internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
 
-    readAttributes(ReadMode::FullyReread);
     return res;
 }
 

src/Series.cpp

@@ -3566,7 +3566,10 @@ void Series::close()
 
 void Series::visitHierarchy(HierarchyVisitor &v, bool recursive)
 {
-    get().iterations.visitHierarchy(v, recursive);
+    if (recursive)
+    {
+        get().iterations.visitHierarchy(v, recursive);
+    }
     v(*this);
 }
 

src/backend/PatchRecord.cpp

@@ -78,8 +78,6 @@ void PatchRecord::flush_impl(
 
 void PatchRecord::read()
 {
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
-
     Parameter<Operation::LIST_DATASETS> dList;
     IOHandler()->enqueue(IOTask(this, dList));
     IOHandler()->flush(internal::defaultFlushParams);
@@ -108,6 +106,10 @@ void PatchRecord::read()
             this->container().erase(component_name);
         }
     }
+
+    readAttributes(ReadMode::FullyReread);
+    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
+
     setDirty(false);
 }
 } // namespace openPMD