wip: ScientificDefaults without CRT

Author: franzpoeschel

include/openPMD/Iteration.hpp

@@ -145,7 +145,7 @@ namespace internal
  */
 class Iteration
     : public Attributable
-    , internal::ScientificDefaults<Iteration>
+    , internal::ScientificDefaults
 {
     template <typename T, typename T_key, typename T_container>
     friend class Container;
@@ -156,7 +156,7 @@ class Iteration
     friend class Writable;
     friend class StatefulIterator;
     friend class StatefulSnapshotsContainer;
-    friend class internal::ScientificDefaults<Iteration>;
+    friend class internal::ScientificDefaults;
 
 public:
     Iteration(Iteration const &) = default;

include/openPMD/Mesh.hpp

@@ -39,13 +39,10 @@ namespace openPMD
  * @see
  * https://github.com/openPMD/openPMD-standard/blob/latest/STANDARD.md#mesh-based-records
  */
-class Mesh
-    : public BaseRecord<MeshRecordComponent>
-    , internal::ScientificDefaults<Mesh>
+class Mesh : public BaseRecord<MeshRecordComponent>
 {
     friend class Container<Mesh>;
     friend class Iteration;
-    template <typename>
     friend class internal::ScientificDefaults;
 
 public:

include/openPMD/ParticleSpecies.hpp

@@ -33,14 +33,13 @@ namespace openPMD
 
 class ParticleSpecies
     : public Container<Record>
-    , internal::ScientificDefaults<ParticleSpecies>
+    , internal::ScientificDefaults
 {
     friend class Container<ParticleSpecies>;
     friend class Container<Record>;
     friend class Iteration;
     template <typename T>
     friend T &internal::makeOwning(T &self, Series);
-    template <typename>
     friend class internal::ScientificDefaults;
 
 public:

include/openPMD/Record.hpp

@@ -30,14 +30,11 @@
 
 namespace openPMD
 {
-class Record
-    : public BaseRecord<RecordComponent>
-    , internal::ScientificDefaults<Record>
+class Record : public BaseRecord<RecordComponent>
 {
     friend class Container<Record>;
     friend class Iteration;
     friend class ParticleSpecies;
-    template <typename>
     friend class internal::ScientificDefaults;
 
 public:

include/openPMD/RecordComponent.hpp

@@ -113,7 +113,7 @@ class BaseRecord;
 
 class RecordComponent
     : public BaseRecordComponent
-    , internal::ScientificDefaults<RecordComponent>
+    , protected internal::ScientificDefaults
 {
     template <typename T, typename T_key, typename T_container>
     friend class Container;
@@ -131,7 +131,6 @@ class RecordComponent
     friend class MeshRecordComponent;
     template <typename T>
     friend T &internal::makeOwning(T &self, Series);
-    template <typename>
     friend class internal::ScientificDefaults;
 
 public:

include/openPMD/backend/BaseRecord.hpp

@@ -180,7 +180,8 @@ template <typename T_elem>
 class BaseRecord
     : public Container<T_elem>
     , public T_elem // T_RecordComponent
-    , internal::ScientificDefaults<BaseRecord<T_elem>>
+// ScientificDefaults already inherited via Container
+// , internal::ScientificDefaults
 {
 public:
     using T_RecordComponent = T_elem;
@@ -199,7 +200,6 @@ class BaseRecord
     friend class internal::ScalarIterator;
     template <typename T>
     friend T &internal::makeOwning(T &self, Series);
-    template <typename>
     friend class internal::ScientificDefaults;
 
     using Data_t =

include/openPMD/backend/MeshRecordComponent.hpp

@@ -33,17 +33,14 @@ namespace internal
     class BaseRecordData;
 }
 
-class MeshRecordComponent
-    : public RecordComponent
-    , internal::ScientificDefaults<MeshRecordComponent>
+class MeshRecordComponent : public RecordComponent
 {
     template <typename T, typename T_key, typename T_container>
     friend class Container;
     template <typename>
     friend class BaseRecord;
     template <typename, typename>
     friend class internal::BaseRecordData;
-    template <typename>
     friend class internal::ScientificDefaults;
 
     friend class Mesh;

include/openPMD/backend/PatchRecord.hpp

@@ -28,14 +28,11 @@
 
 namespace openPMD
 {
-class PatchRecord
-    : public BaseRecord<PatchRecordComponent>
-    , internal::ScientificDefaults<PatchRecord>
+class PatchRecord : public BaseRecord<PatchRecordComponent>
 {
     friend class Container<PatchRecord>;
     friend class ParticleSpecies;
     friend class ParticlePatches;
-    template <typename>
     friend class internal::ScientificDefaults;
 
 public:

include/openPMD/backend/PatchRecordComponent.hpp

@@ -43,9 +43,7 @@ namespace openPMD
 /**
  * @todo add support for constant patch record components
  */
-class PatchRecordComponent
-    : public RecordComponent
-    , internal::ScientificDefaults<PatchRecordComponent>
+class PatchRecordComponent : public RecordComponent
 {
     template <typename T, typename T_key, typename T_container>
     friend class Container;
@@ -56,7 +54,6 @@ class PatchRecordComponent
     friend class ParticlePatches;
     friend class PatchRecord;
     friend class ParticleSpecies;
-    template <typename>
     friend class internal::ScientificDefaults;
 
 public:

include/openPMD/backend/ScientificDefaults.hpp

@@ -14,24 +14,16 @@ struct ConfigAttribute;
  * It implements (most of) the attribute definitions from
  * github.com/openPMD/openPMD-standard/blob/latest/STANDARD.md
  */
-template <typename Child> // CRT
 class ScientificDefaults
 {
 private:
-    auto asChild() -> Child &;
-    auto asChild() const -> Child const &;
-
-    template <typename F>
-    using setter_t = Child &(Child::*)();
-
     [[nodiscard]] auto defaultAttribute(char const *attrName)
         -> ConfigAttribute;
 
     template <typename Parent, bool write>
     void addParentDefaults(OpenpmdStandard);
 
-    template <bool write>
-    void defaults_impl(OpenpmdStandard);
+    virtual void defaults_impl(bool write, OpenpmdStandard);
 
 protected:
     // Called upon Iteration::close(), will fill in defaults below Iteration
@@ -50,5 +42,5 @@ class ScientificDefaults
 
 template <typename Child>
 constexpr bool HasScientificDefaults_v =
-    std::is_base_of_v<ScientificDefaults<Child>, Child>;
+    std::is_base_of_v<ScientificDefaults, Child>;
 } // namespace openPMD::internal