Merge branch 'bugfix/NSVEcomplex_particles' into develop

cpp/full_code/NSVEcomplex_particles.cpp

@@ -74,6 +74,8 @@ int NSVEcomplex_particles<rnumber>::initialize(void)
                 (this->simname + "_particles.h5"),
                 "tracers0",
                 "position/0");
+    this->particles_output_writer_mpi->setParticleFileLayout(this->ps->getParticleFileLayout());
+    this->particles_sample_writer_mpi->setParticleFileLayout(this->ps->getParticleFileLayout());
 
 
     /// allocate grad vel field
@@ -164,7 +166,7 @@ int NSVEcomplex_particles<rnumber>::do_stats()
     this->particles_sample_writer_mpi->template save_dataset<3>(
             "tracers0",
             "position",
-            pdata0.get(),
+            pdata0.get(), // we need to use pdata0.get() here, because it's 3D, whereas getParticlesState may give something else
             &pdata0,
             this->ps->getParticlesIndexes(),
             this->ps->getLocalNbParticles(),

cpp/particles/particles_output_sampling_hdf5.hpp

@@ -278,7 +278,7 @@ public:
         }
     }
 
-    int setParticleFileLayout(std::vector<hsize_t> input_layout){
+    int setParticleFileLayout(const std::vector<hsize_t> input_layout){
         this->particle_file_layout.resize(input_layout.size());
         for (unsigned int i=0; i<this->particle_file_layout.size(); i++)
             this->particle_file_layout[i] = input_layout[i];