Fully re-read an Iteration in stepping mode

Author: franzpoeschel

include/openPMD/Iteration.hpp

@@ -181,7 +181,7 @@ class Iteration : public LegacyAttributable
      * logic for an iteration.
      *
      */
-    void read();
+    void read( std::string path, bool reread = false );
     void readFileBased( std::string filePath, std::string const & groupPath );
     void readGroupBased( std::string const & groupPath );
     void read_impl( std::string const & groupPath );
@@ -298,7 +298,7 @@ class Iteration : public LegacyAttributable
         *newAccess = Access::READ_WRITE;
         try
         {
-            read();
+            read( "", false );
         }
         catch( ... )
         {

include/openPMD/RecordComponent.hpp

@@ -242,12 +242,6 @@ class RecordComponent : public BaseRecordComponent
      */
     bool
     dirtyRecursive() const;
-
-protected:
-    /**
-     * Make sure to parse a RecordComponent only once.
-     */
-    std::shared_ptr< bool > hasBeenRead = std::make_shared< bool >( false );
 }; // RecordComponent
 
 

include/openPMD/backend/PatchRecordComponent.hpp

@@ -75,7 +75,6 @@ class PatchRecordComponent : public BaseRecordComponent
     void read();
 
     std::shared_ptr< std::queue< IOTask > > m_chunks;
-    std::shared_ptr< bool > hasBeenRead = std::make_shared< bool >( false );
 
     /**
      * @brief Check recursively whether this RecordComponent is dirty.

src/Iteration.cpp

@@ -321,8 +321,13 @@ void Iteration::deferRead( DeferredRead dr )
     *m_deferredRead = auxiliary::makeOption< DeferredRead >( std::move( dr ) );
 }
 
-void Iteration::read()
+void Iteration::read( std::string path, bool reread )
 {
+    if( reread )
+    {
+        read_impl( path );
+        return;
+    }
     if( !m_deferredRead->has_value() )
     {
         return;

src/Mesh.cpp

@@ -331,11 +331,6 @@ Mesh::read()
         for( auto const& component : *pList.paths )
         {
             MeshRecordComponent& rc = (*this)[component];
-            if ( *rc.hasBeenRead )
-            {
-                dirty() = false;
-                continue;
-            }
             pOpen.path = component;
             IOHandler()->enqueue(IOTask(&rc, pOpen));
             *rc.m_isConstant = true;
@@ -350,11 +345,6 @@ Mesh::read()
         for( auto const& component : *dList.datasets )
         {
             MeshRecordComponent & rc = ( *this )[ component ];
-            if( *rc.hasBeenRead )
-            {
-                dirty() = false;
-                continue;
-            }
             dOpen.name = component;
             IOHandler()->enqueue(IOTask(&rc, dOpen));
             IOHandler()->flush();

src/Record.cpp

@@ -98,11 +98,6 @@ Record::read()
         for( auto const& component : *pList.paths )
         {
             RecordComponent& rc = (*this)[component];
-            if ( *rc.hasBeenRead )
-            {
-                dirty() = false;
-                continue;
-            }
             pOpen.path = component;
             IOHandler()->enqueue(IOTask(&rc, pOpen));
             *rc.m_isConstant = true;
@@ -117,10 +112,6 @@ Record::read()
         for( auto const& component : *dList.datasets )
         {
             RecordComponent & rc = ( *this )[ component ];
-            if( *rc.hasBeenRead )
-            {
-                continue;
-            }
             dOpen.name = component;
             IOHandler()->enqueue(IOTask(&rc, dOpen));
             IOHandler()->flush();

src/RecordComponent.cpp

@@ -248,13 +248,7 @@ RecordComponent::flush(std::string const& name)
 void
 RecordComponent::read()
 {
-    if ( *hasBeenRead )
-    {
-        dirty() = false;
-        return;
-    }
     readBase();
-    *hasBeenRead = true;
 }
 
 void

src/Series.cpp

@@ -1019,21 +1019,21 @@ SeriesImpl::readGorVBased( bool do_init )
 
     auto readSingleIteration =
         [&series, &pOpen, this]
-        (uint64_t index, std::string path)
+        (uint64_t index, std::string path, bool guardClosed )
     {
         if( series.iterations.contains( index ) )
         {
             // maybe re-read
             auto & i = series.iterations.at( index );
-            if( i.closedByWriter() )
+            if( guardClosed && i.closedByWriter() )
             {
                 return;
             }
             if( *i.m_closed != Iteration::CloseStatus::NotYetAccessed )
             {
                 pOpen.path = path;
                 IOHandler()->enqueue( IOTask( &i, pOpen ) );
-                i.read();
+                i.read( path, /* reread = */ true );
             }
         }
         else
@@ -1063,7 +1063,7 @@ SeriesImpl::readGorVBased( bool do_init )
         for( auto const & it : *pList.paths )
         {
             uint64_t index = std::stoull( it );
-            readSingleIteration( index, it );
+            readSingleIteration( index, it, true );
         }
         break;
     case IterationEncoding::variableBased:
@@ -1075,7 +1075,7 @@ SeriesImpl::readGorVBased( bool do_init )
                 .getAttribute( "__step__" )
                 .get< uint64_t >();
         }
-        readSingleIteration( index, "" );
+        readSingleIteration( index, "", false );
         break;
     }
     }

src/backend/MeshRecordComponent.cpp

@@ -32,11 +32,6 @@ MeshRecordComponent::MeshRecordComponent()
 void
 MeshRecordComponent::read()
 {
-    if ( *hasBeenRead )
-    {
-        dirty() = false;
-        return;
-    }
     using DT = Datatype;
     Parameter< Operation::READ_ATT > aRead;
 
@@ -60,7 +55,6 @@ MeshRecordComponent::read()
         throw std::runtime_error( "Unexpected Attribute datatype for 'position'");
 
     readBase();
-    *hasBeenRead = true;
 }
 
 template< typename T >

src/backend/PatchRecordComponent.cpp

@@ -105,12 +105,6 @@ PatchRecordComponent::flush(std::string const& name)
 void
 PatchRecordComponent::read()
 {
-    if ( *hasBeenRead )
-    {
-        dirty() = false;
-        return;
-    }
-
     Parameter< Operation::READ_ATT > aRead;
 
     aRead.name = "unitSI";
@@ -122,8 +116,6 @@ PatchRecordComponent::read()
         throw std::runtime_error("Unexpected Attribute datatype for 'unitSI'");
 
     readAttributes(); // this will set dirty() = false
-
-    *hasBeenRead = true;
 }
 
 bool