Skip to content

Commit c962c95

Browse files
committed
Dead code removal, some commenting
1 parent daf0bd7 commit c962c95

3 files changed

Lines changed: 17 additions & 11 deletions

File tree

include/openPMD/Iteration.hpp

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232

3333
namespace openPMD
3434
{
35-
namespace traits
36-
{
37-
struct AccessIteration;
38-
}
39-
4035
/** @brief Logical compilation of data from one snapshot (e.g. a single simulation cycle).
4136
*
4237
* @see https://github.com/openPMD/openPMD-standard/blob/latest/STANDARD.md#required-attributes-for-the-basepath
@@ -52,7 +47,6 @@ class Iteration : public LegacyAttributable
5247
friend class SeriesImpl;
5348
friend class WriteIterations;
5449
friend class SeriesIterator;
55-
friend struct traits::AccessIteration;
5650

5751
public:
5852
Iteration( Iteration const & ) = default;
@@ -171,6 +165,20 @@ class Iteration : public LegacyAttributable
171165
void flushGroupBased(uint64_t);
172166
void flush();
173167
void deferRead( DeferredRead );
168+
/*
169+
* Control flow for read(), readFileBased(), readGroupBased() and
170+
* read_impl():
171+
* read() is called as the entry point. File-based and group-based
172+
* iteration layouts need to be parsed slightly differently:
173+
* In file-based iteration layout, each iteration's file also contains
174+
* attributes for the /data group. In group-based layout, those have
175+
* already been parsed during opening of the Series.
176+
* Hence, read() will call either readFileBased() or readGroupBased() to
177+
* allow for those different control flows.
178+
* Finally, read_impl() is called which contains the common parsing
179+
* logic for an iteration.
180+
*
181+
*/
174182
void read();
175183
void readFileBased( std::string filePath, std::string const & groupPath );
176184
void readGroupBased( std::string const & groupPath );
@@ -300,7 +308,9 @@ class Iteration : public LegacyAttributable
300308

301309
using Iterations_t = Container< Iteration, uint64_t >;
302310

303-
extern template float Iteration::time< float >() const;
311+
extern template
312+
float
313+
Iteration::time< float >() const;
304314

305315
extern template
306316
double

include/openPMD/Series.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,6 @@ class Series : public SeriesImpl
430430
bool parseLazily = false );
431431
#endif
432432

433-
/*
434-
* @todo Think it's time for a SeriesBuilder.
435-
*/
436433
Series(
437434
std::string const & filepath,
438435
Access at,

src/Iteration.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "openPMD/backend/Writable.hpp"
2929

3030
#include <exception>
31-
#include <iostream>
3231
#include <tuple>
3332

3433

0 commit comments

Comments
 (0)