Merge branch 'PHAREHUB:master' into vtk

Author: PhilipDeegan

tools/bench/amr/data/particles/copy_data.cpp

@@ -29,6 +29,7 @@ class ParticleDataCopy : public benchmark::Fixture
 
         data->sourceData.domainParticles = PHARE::core::bench::make_particles<dim>(ppc, sourceBox);
         assert(data->sourceData.domainParticles.size() == ppc * sourceBox.size());
+        assert(data->destData.domainParticles.size() == 0);
     }
 
     void TearDown(::benchmark::State const& /*state*/) override {}
@@ -37,9 +38,9 @@ class ParticleDataCopy : public benchmark::Fixture
 
 private:
     static const inline PHARE::amr::Box<int, dim> sourceBox{PHARE::core::ConstArray<int, dim>(0),
-                                                            PHARE::core::ConstArray<int, dim>(999)};
-    static const inline PHARE::amr::Box<int, dim> destBox{PHARE::core::ConstArray<int, dim>(500),
-                                                          PHARE::core::ConstArray<int, dim>(1499)};
+                                                            PHARE::core::ConstArray<int, dim>(19)};
+    static const inline PHARE::amr::Box<int, dim> destBox{PHARE::core::ConstArray<int, dim>(10),
+                                                          PHARE::core::ConstArray<int, dim>(19)};
 
 
     struct _DATA_ // gbench static init doesn't play well with SAMRAI
@@ -61,7 +62,10 @@ template<std::size_t dim, std::size_t interp, std::size_t op>
 void ParticleDataCopy<dim, interp, op>::copy_data(::benchmark::State& state)
 {
     for (auto _ : state)
+    {
         this->data->destData.copy(this->data->sourceData);
+        data->destData.domainParticles.clear();
+    }
 }
 
 BENCHMARK_TEMPLATE_DEFINE_F(ParticleDataCopy, _2_1_1, 2, 1, 1)(benchmark::State& state)

tools/bench/core/bench.hpp

@@ -1,16 +1,16 @@
 #ifndef PHARE_BENCH_CORE_BENCH_H
 #define PHARE_BENCH_CORE_BENCH_H
 
-#include "core/utilities/box/box.hpp"
-
 #include "phare_core.hpp"
 
+#include "core/utilities/box/box.hpp"
+
 #include "tests/core/data/vecfield/test_vecfield_fixtures.hpp"
 #include "tests/core/data/electromag/test_electromag_fixtures.hpp"
 
 #include "benchmark/benchmark.h"
+
 #include <fstream>
-#include <iterator>
 
 namespace PHARE::core::bench
 {
@@ -60,8 +60,7 @@ template<std::size_t dim, typename ParticleArray_t = PHARE::core::ParticleArray<
 auto make_particles(std::size_t n_particles)
 {
     auto particles = ParticleArray_t{Box<int, dim>{}};
-    particles.vector()
-        = std::vector<typename ParticleArray_t::value_type>(n_particles, particle<dim>());
+    particles.vector().resize(n_particles, particle<dim>());
     return particles;
 }
 
@@ -93,10 +92,11 @@ void disperse(Particles& particles, std::size_t lo, std::size_t up,
     disperse(particles, core::ConstArray<int, dim>(lo), core::ConstArray<int, dim>(up), seed);
 }
 
-template<std::size_t dim, typename Box>
+template<std::size_t dim, typename Box, typename ParticleArray_t = PHARE::core::ParticleArray<dim>>
 auto make_particles(std::size_t ppc, Box disperse_in, std::optional<int> seed = std::nullopt)
 {
-    auto particles = make_particles<dim>(ppc * disperse_in.size());
+    auto particles = ParticleArray_t{disperse_in};
+    particles.vector().resize(ppc * disperse_in.size(), particle<dim>());
     disperse(particles, disperse_in.lower, disperse_in.upper, seed);
     return particles;
 }