Don't write unitSI in custom datasets

openPMD · Nov 14, 2023 · 01030c9 · 01030c9
1 parent d4ac9fc
commit 01030c9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/include/openPMD/RecordComponent.hpp b/include/openPMD/RecordComponent.hpp
@@ -432,7 +432,8 @@ class RecordComponent : public BaseRecordComponent
     static constexpr char const *const SCALAR = "\vScalar";
 
 private:
-    void flush(std::string const &, internal::FlushParams const &);
+    void flush(
+        std::string const &, internal::FlushParams const &, bool set_defaults);
     virtual void read();
 
     /**

diff --git a/src/CustomHierarchy.cpp b/src/CustomHierarchy.cpp
@@ -629,7 +629,7 @@ void CustomHierarchy::flush_internal(
     }
     for (auto &[name, dataset] : get().embeddedDatasets())
     {
-        dataset.flush(name, flushParams);
+        dataset.flush(name, flushParams, /* set_defaults = */ false);
     }
 }
 

diff --git a/src/Record.cpp b/src/Record.cpp
@@ -50,12 +50,14 @@ void Record::flush_impl(
     {
         if (scalar())
         {
-            T_RecordComponent::flush(SCALAR, flushParams);
+            T_RecordComponent::flush(
+                SCALAR, flushParams, /* set_defaults = */ true);
         }
         else
         {
             for (auto &comp : *this)
-                comp.second.flush(comp.first, flushParams);
+                comp.second.flush(
+                    comp.first, flushParams, /* set_defaults = */ true);
         }
     }
     else
@@ -65,7 +67,7 @@ void Record::flush_impl(
             if (scalar())
             {
                 RecordComponent &rc = *this;
-                rc.flush(name, flushParams);
+                rc.flush(name, flushParams, /* set_defaults = */ true);
             }
             else
             {
@@ -75,7 +77,8 @@ void Record::flush_impl(
                 for (auto &comp : *this)
                 {
                     comp.second.parent() = getWritable(this);
-                    comp.second.flush(comp.first, flushParams);
+                    comp.second.flush(
+                        comp.first, flushParams, /* set_defaults = */ true);
                 }
             }
         }
@@ -84,12 +87,14 @@ void Record::flush_impl(
 
             if (scalar())
             {
-                T_RecordComponent::flush(name, flushParams);
+                T_RecordComponent::flush(
+                    name, flushParams, /* set_defaults = */ true);
             }
             else
             {
                 for (auto &comp : *this)
-                    comp.second.flush(comp.first, flushParams);
+                    comp.second.flush(
+                        comp.first, flushParams, /* set_defaults = */ true);
             }
         }
 

diff --git a/src/RecordComponent.cpp b/src/RecordComponent.cpp
@@ -219,7 +219,9 @@ bool RecordComponent::empty() const
 }
 
 void RecordComponent::flush(
-    std::string const &name, internal::FlushParams const &flushParams)
+    std::string const &name,
+    internal::FlushParams const &flushParams,
+    bool set_defaults)
 {
     auto &rc = get();
     if (flushParams.flushLevel == FlushLevel::SkeletonOnly)
@@ -258,7 +260,7 @@ void RecordComponent::flush(
                     "before flushing (see RecordComponent::resetDataset()).");
             }
         }
-        if (!containsAttribute("unitSI"))
+        if (set_defaults && !containsAttribute("unitSI"))
         {
             setUnitSI(1);
         }

diff --git a/src/backend/MeshRecordComponent.cpp b/src/backend/MeshRecordComponent.cpp
@@ -75,7 +75,7 @@ void MeshRecordComponent::flush(
     {
         setPosition(std::vector<double>{0});
     }
-    RecordComponent::flush(name, params);
+    RecordComponent::flush(name, params, /* set_defaults = */ true);
 }
 
 template <typename T>
-Original file line number
+Diff line change
@@ Expand Up / @@ -629,7 +629,7 @@ void CustomHierarchy::flush_internal( @@
         }
         for (auto &[name, dataset] : get().embeddedDatasets())
         {
-            dataset.flush(name, flushParams);
+            dataset.flush(name, flushParams, /* set_defaults = */ false);
         }
     }
@@ Expand Down @@