Merged in species_name_in_plotfiles (pull request #82)

[WIP] Use the species names to label the particles in the plot files.

Approved-by: Remi Lehe <remi.lehe@normalesup.org>

1 files changed, 5 insertions, 8 deletions

diff --git a/Source/ParticleIO.cpp b/Source/ParticleIO.cpp
index 81a32cd9d..ced2d6b9a 100644
--- a/Source/ParticleIO.cpp
+++ b/Source/ParticleIO.cpp
@@ -20,22 +20,19 @@ WarpXParticleContainer::WriteHeader (std::ostream& os) const
 
 void
 MultiParticleContainer::Checkpoint (const std::string& dir, 
-				    const std::string& name,
 				    bool is_checkpoint,
                                     const Vector<std::string>& varnames) const
 {
-    for (unsigned i = 0, n = allcontainers.size(); i < n; ++i) {
-	std::string namei = name + std::to_string(i);
-	allcontainers[i]->Checkpoint(dir, namei, is_checkpoint, varnames);
+    for (unsigned i = 0, n = species_names.size(); i < n; ++i) {
+	allcontainers[i]->Checkpoint(dir, species_names[i], is_checkpoint, varnames);
     }
 }
 
 void
-MultiParticleContainer::Restart (const std::string& dir, const std::string& name)
+MultiParticleContainer::Restart (const std::string& dir)
 {
-    for (unsigned i = 0, n = allcontainers.size(); i < n; ++i) {
-	std::string namei = name + std::to_string(i);
-	allcontainers[i]->Restart(dir, namei);
+    for (unsigned i = 0, n = species_names.size(); i < n; ++i) {
+	allcontainers[i]->Restart(dir, species_names[i]);
     }
 }