Fix dirty handling

Author: franzpoeschel

include/openPMD/backend/Attributable.hpp

@@ -59,6 +59,7 @@ namespace internal
     class SeriesData;
     struct HomogenizeExtents;
     struct ConfigAttribute;
+    class ScientificDefaults;
 
     class SharedAttributableData
     {
@@ -247,6 +248,7 @@ class Attributable
     friend class Snapshots;
     friend struct internal::HomogenizeExtents;
     friend struct internal::ConfigAttribute;
+    friend class internal::ScientificDefaults;
 
 protected:
     // tag for internal constructor

include/openPMD/backend/scientific_defaults/ScientificDefaults.hpp

@@ -48,6 +48,6 @@ class ScientificDefaults
     void writeDefaults(OpenpmdStandard);
 
     // Called at appropriate places during parsing.
-    void readDefaults(OpenpmdStandard);
+    void readDefaults(Attributable &, OpenpmdStandard);
 };
 } // namespace openPMD::internal

src/Iteration.cpp

@@ -599,7 +599,7 @@ void Iteration::read_impl(std::string const &groupPath)
     particles.setDirty(false);
 
     readAttributes(ReadMode::FullyReread);
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
+    internal::ScientificDefaults::readDefaults(*this, IOHandler()->m_standard);
 
 #ifdef openPMD_USE_INVASIVE_TESTS
     if (containsAttribute("__openPMD_internal_fail"))

src/Mesh.cpp

@@ -564,7 +564,7 @@ void Mesh::read()
     std::move(homogenizeExtents).homogenize(*this);
 
     readAttributes(ReadMode::FullyReread);
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
+    internal::ScientificDefaults::readDefaults(*this, IOHandler()->m_standard);
 }
 } // namespace openPMD
 

src/Record.cpp

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

src/RecordComponent.cpp

@@ -532,7 +532,7 @@ void RecordComponent::flush(
 void RecordComponent::read()
 {
     readBase();
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
+    internal::ScientificDefaults::readDefaults(*this, IOHandler()->m_standard);
 }
 
 namespace

src/backend/MeshRecordComponent.cpp

@@ -42,7 +42,7 @@ MeshRecordComponent::MeshRecordComponent(
 void MeshRecordComponent::read()
 {
     readBase();
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
+    internal::ScientificDefaults::readDefaults(*this, IOHandler()->m_standard);
 }
 
 void MeshRecordComponent::flush(

src/backend/PatchRecord.cpp

@@ -108,7 +108,7 @@ void PatchRecord::read()
     }
 
     readAttributes(ReadMode::FullyReread);
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
+    internal::ScientificDefaults::readDefaults(*this, IOHandler()->m_standard);
 
     setDirty(false);
 }

src/backend/PatchRecordComponent.cpp

@@ -69,7 +69,7 @@ PatchRecordComponent::PatchRecordComponent(
 void PatchRecordComponent::read()
 {
     readBase();
-    internal::ScientificDefaults::readDefaults(IOHandler()->m_standard);
+    internal::ScientificDefaults::readDefaults(*this, IOHandler()->m_standard);
 }
 
 PatchRecordComponent::PatchRecordComponent() : RecordComponent(NoInit())

src/backend/scientific_defaults/ScientificDefaults.cpp

@@ -20,8 +20,16 @@ void ScientificDefaults::writeDefaults(OpenpmdStandard standard)
     scientificDefaults_impl(WriteOrRead::Write, standard);
 }
 
-void ScientificDefaults::readDefaults(OpenpmdStandard standard)
+void ScientificDefaults::readDefaults(
+    Attributable &self, OpenpmdStandard standard)
 {
+    auto old_dirty = self.dirty();
     scientificDefaults_impl(WriteOrRead::Read, standard);
+    if (!old_dirty)
+    {
+        // did not become dirty by reading
+        // but setAttribute() might have been used, so set it again
+        self.setDirty(false);
+    }
 }
 } // namespace openPMD::internal