diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/ParticleContainer.H | 3 | ||||
| -rw-r--r-- | Source/ParticleIO.cpp | 13 | ||||
| -rw-r--r-- | Source/WarpXElectrostatic.cpp | 2 | ||||
| -rw-r--r-- | Source/WarpXIO.cpp | 6 |
4 files changed, 10 insertions, 14 deletions
diff --git a/Source/ParticleContainer.H b/Source/ParticleContainer.H index cf0383324..a92ded4ea 100644 --- a/Source/ParticleContainer.H +++ b/Source/ParticleContainer.H @@ -124,11 +124,10 @@ public: std::unique_ptr<amrex::MultiFab> GetChargeDensity(int lev, bool local = false); void Checkpoint (const std::string& dir, - const std::string& name, bool is_checkpoint, const amrex::Vector<std::string>& varnames = amrex::Vector<std::string>()) const; - void Restart (const std::string& dir, const std::string& name); + void Restart (const std::string& dir); void PostRestart (); 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]); } } diff --git a/Source/WarpXElectrostatic.cpp b/Source/WarpXElectrostatic.cpp index 1c86b620f..277dc2887 100644 --- a/Source/WarpXElectrostatic.cpp +++ b/Source/WarpXElectrostatic.cpp @@ -428,7 +428,7 @@ WritePlotFileES (const amrex::Vector<std::unique_ptr<amrex::MultiFab> >& rho, particle_varnames.push_back("By"); particle_varnames.push_back("Bz"); - mypc->Checkpoint(plotfilename, "particle", true, particle_varnames); + mypc->Checkpoint(plotfilename, true, particle_varnames); WriteJobInfo(plotfilename); diff --git a/Source/WarpXIO.cpp b/Source/WarpXIO.cpp index 9e42f8614..2e6fd264d 100644 --- a/Source/WarpXIO.cpp +++ b/Source/WarpXIO.cpp @@ -170,7 +170,7 @@ WarpX::WriteCheckPointFile() const } } - mypc->Checkpoint(checkpointname, "particle", true); + mypc->Checkpoint(checkpointname, true); VisMF::SetHeaderVersion(current_version); } @@ -381,7 +381,7 @@ WarpX::InitFromCheckpoint () // Initilize particles mypc->AllocData(); - mypc->Restart(restart_chkfile, "particle"); + mypc->Restart(restart_chkfile); #ifdef WARPX_DO_ELECTROSTATIC if (do_electrostatic) { @@ -822,7 +822,7 @@ WarpX::WritePlotFile () const particle_varnames.push_back("uzold"); #endif - mypc->Checkpoint(plotfilename, "particle", true, particle_varnames); + mypc->Checkpoint(plotfilename, true, particle_varnames); WriteJobInfo(plotfilename); |