fix(probes): unique probe_size_counter per probe

Author: Benncs

apps/core/includes/dataexporter/partial_exporter.hpp

@@ -10,6 +10,7 @@
 #include <span>
 #include <string>
 #include <string_view>
+#include <unordered_map>
 #include <vector>
 
 namespace Core
@@ -68,11 +69,13 @@ namespace Core
      *
      * @param data A span of constant doubles containing the probe measurements.
      */
-    void write_probe(std::string_view probe_name, std::span<const double> data);
+    void write_probe(const std::string& probe_name,
+                     std::span<const double> data);
 
   private:
-    uint64_t probe_counter_n_element; /**< Counter for the number of probe
-                                         elements. */
+    // uint64_t probe_counter_n_element; /**< Counter for the number of probe
+    //                                      elements. */
+    std::unordered_map<std::string, uint64_t> probe_counter_n_element;
   };
 
 }; // namespace Core

apps/core/src/case_data.cpp

@@ -43,11 +43,15 @@ namespace Core
     const auto [_, n_compartment] = case_data.simulation->getDimensions();
     partial_exporter.init_fields(case_data.params.number_exported_result,
                                  n_compartment);
+
+    // TODO: so far all probes are active or all probes are inactive
+    // Find a way to select them without branching in kernels
     {
       auto probes = Simulation::ProbeAutogeneratedBuffer();
       case_data.simulation->setProbes(Simulation::ProbeType::LeavingTime,
                                       std::move(probes));
     }
+
     {
       auto probes = Simulation::ProbeAutogeneratedBuffer();
       case_data.simulation->setProbes(Simulation::ProbeType::DivisionTime,

apps/core/src/dataexporter/partial_exporter.cpp

@@ -15,8 +15,8 @@ namespace Core
       const ExecInfo& info,
       std::string_view _filename,
       std::optional<export_metadata_t> user_description)
-      : DataExporter(info, _filename, std::move(user_description)),
-        probe_counter_n_element(0)
+      : DataExporter(info, _filename, std::move(user_description))
+
   {
     write_properties(std::nullopt, metadata);
   }
@@ -49,10 +49,13 @@ namespace Core
       std::vector<unsigned long long> chunk
           = { AutoGenerated::probe_buffer_size * sizeof(double) };
 
+      uint64_t counter = 0;
       for (const auto& name : Simulation::map_probe_name)
       {
 
-        auto ds_name = IO::format("probes/", name);
+        const auto ds_name = IO::format("probes/", name);
+        probe_counter_n_element.insert({ name, counter });
+        counter += 1;
         MultiMatrixDescription probes
             = { .name = ds_name,
                 .dims = { 0 },
@@ -81,13 +84,14 @@ namespace Core
   //  Change probe_counter_n_element to std::vector<std::size_t> where size is
   //  number of probe type
   void
-  PartialExporter::write_probe(std::string_view probe_name,
+  PartialExporter::write_probe(const std::string& probe_name,
                                std::span<const double> data)
   {
     std::string data_set_name = IO::format("probes/", probe_name);
+    auto& counter = this->probe_counter_n_element[probe_name];
 
-    append_array(data_set_name, data, probe_counter_n_element);
-    probe_counter_n_element += data.size();
+    append_array(data_set_name, data, counter);
+    counter += data.size();
   }
 
   void