++

Author: PhilipDeegan

src/core/data/particles/particle_array.hpp

@@ -341,15 +341,16 @@ namespace core
         };
 
 
+        template<typename T>
+        using tuple_element = std::tuple<std::string, container_t<T>&, std::size_t>;
 
         auto static _as_named_tuple(auto&& self)
         {
-            return std::make_tuple(                              //
-                std::forward_as_tuple("weight", self.weight, 1), //
-                std::forward_as_tuple("charge", self.charge, 1), //
-                std::forward_as_tuple("iCell", self.iCell, dim), //
-                std::forward_as_tuple("delta", self.delta, dim), //
-                std::forward_as_tuple("v", self.v, 3));
+            return std::make_tuple(tuple_element<double>("weight", self.weight, 1),
+                                   tuple_element<double>("charge", self.charge, 1),
+                                   tuple_element<int>("iCell", self.iCell, dim),
+                                   tuple_element<double>("delta", self.delta, dim),
+                                   tuple_element<double>("v", self.v, 3));
         }
 
         auto operator()() { return _as_named_tuple(*this); }

src/core/utilities/types.hpp

@@ -104,12 +104,12 @@ namespace core
 
 
     template<typename TupleOfTuples, typename Func>
-    void double_apply(TupleOfTuples&& tuples, Func const func)
+    void double_apply(TupleOfTuples&& tuples, Func&& func)
     {
         auto on_tuple
-            = [&](auto& tuple) { std::apply([&](auto&... args) { func(args...); }, tuple); };
+            = [&](auto& tuple) { std::apply([&](auto&&... args) { func(args...); }, tuple); };
 
-        std::apply([&](auto&... args) { (on_tuple(args), ...); }, tuples);
+        std::apply([&](auto&&... args) { (on_tuple(args), ...); }, tuples);
     }
 
     template<typename Type, std::size_t Size> // std::array::fill is only constexpr in C++20 ffs

src/hdf5/writer/particle_writer.hpp

@@ -21,16 +21,14 @@ class ParticleWriter
         auto constexpr dim = Particles::dimension;
         using Packer       = core::ParticlePacker<dim>;
 
-        PHARE_LOG_LINE_SS(particles.size());
         Packer{particles}.pack_ranges_into([&](auto&&... args) {
             auto&& [arr, from] = std::forward_as_tuple(args...);
 
-            PHARE_LOG_LINE_SS(arr.size() << " " << from);
             core::double_apply(arr(), [&](auto const& key, auto const& arg, auto size) {
-                PHARE_LOG_LINE_SS(arg.size() << " " << key);
-
-                PHARE_LOG_LINE_SS(h5file.file().getDataSet(path + key).getStorageSize());
-                h5file.file().getDataSet(path + key).select({from * size}, {arg.size()}).write(arg);
+                h5file.file()
+                    .getDataSet(path + key)
+                    .select({from, 0ul}, {arr.size(), size})
+                    .write_raw(arg.data());
             });
         });
     }