diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Diagnostics/BoostedFrameDiagnostic.cpp | 18 | ||||
| -rw-r--r-- | Source/Particles/MultiParticleContainer.H | 8 | ||||
| -rw-r--r-- | Source/Particles/MultiParticleContainer.cpp | 18 |
3 files changed, 22 insertions, 22 deletions
diff --git a/Source/Diagnostics/BoostedFrameDiagnostic.cpp b/Source/Diagnostics/BoostedFrameDiagnostic.cpp index 49038b9e2..affe28cb5 100644 --- a/Source/Diagnostics/BoostedFrameDiagnostic.cpp +++ b/Source/Diagnostics/BoostedFrameDiagnostic.cpp @@ -539,8 +539,8 @@ void BoostedFrameDiagnostic::Flush(const Geometry& geom) } if (WarpX::do_boosted_frame_particles) { - for (int j = 0; j < mypc.nSpeciesLabFrameDiags(); ++j) { - int js = mypc.mapSpeciesLabDiags(j); + for (int j = 0; j < mypc.nSpeciesBoostedFrameDiags(); ++j) { + int js = mypc.mapSpeciesBoostedFrameDiags(j); std::string species_name = species_names[js]; #ifdef WARPX_USE_HDF5 writeParticleDataHDF5(particles_buffer_[i][j], @@ -603,7 +603,7 @@ writeLabFrameData(const MultiFab* cell_centered_data, DistributionMapping buff_dm(buff_ba); data_buffer_[i].reset( new MultiFab(buff_ba, buff_dm, ncomp, 0) ); } - if (WarpX::do_boosted_frame_particles) particles_buffer_[i].resize(mypc.nSpeciesLabFrameDiags()); + if (WarpX::do_boosted_frame_particles) particles_buffer_[i].resize(mypc.nSpeciesBoostedFrameDiags()); } if (WarpX::do_boosted_frame_fields) { @@ -671,9 +671,9 @@ writeLabFrameData(const MultiFab* cell_centered_data, if (WarpX::do_boosted_frame_particles) { - for (int j = 0; j < mypc.nSpeciesLabFrameDiags(); ++j) { + for (int j = 0; j < mypc.nSpeciesBoostedFrameDiags(); ++j) { - const std::string species_name = species_names[mypc.mapSpeciesLabDiags(j)]; + const std::string species_name = species_names[mypc.mapSpeciesBoostedFrameDiags(j)]; #ifdef WARPX_USE_HDF5 writeParticleDataHDF5(particles_buffer_[i][j], snapshots_[i].file_name, @@ -867,9 +867,9 @@ LabSnapShot(Real t_lab_in, Real t_boost, Real zmin_lab_in, if (WarpX::do_boosted_frame_particles){ auto & mypc = WarpX::GetInstance().GetPartContainer(); const std::vector<std::string> species_names = mypc.GetSpeciesNames(); - for (int j = 0; j < mypc.nSpeciesLabFrameDiags(); ++j) + for (int j = 0; j < mypc.nSpeciesBoostedFrameDiags(); ++j) { - int js = mypc.mapSpeciesLabDiags(j); + int js = mypc.mapSpeciesBoostedFrameDiags(j); std::string species_name = species_names[js]; output_create_species_group(file_name, species_name); for (int k = 0; k < static_cast<int>(particle_field_names.size()); ++k) @@ -896,8 +896,8 @@ LabSnapShot(Real t_lab_in, Real t_boost, Real zmin_lab_in, const std::vector<std::string> species_names = mypc.GetSpeciesNames(); const std::string particles_prefix = "particle"; - for(int i = 0; i < mypc.nSpeciesLabFrameDiags(); ++i) { - int is = mypc.mapSpeciesLabDiags(i); + for(int i = 0; i < mypc.nSpeciesBoostedFrameDiags(); ++i) { + int is = mypc.mapSpeciesBoostedFrameDiags(i); std::string species_name = species_names[is]; const std::string fullpath = file_name + "/" + species_name; if (!UtilCreateDirectory(fullpath, 0755)) diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H index e88879127..6b511b9cb 100644 --- a/Source/Particles/MultiParticleContainer.H +++ b/Source/Particles/MultiParticleContainer.H @@ -155,8 +155,8 @@ public: int nSpecies() const {return nspecies;} - int nSpeciesLabFrameDiags() const {return nspecies_lab_frame_diags;} - int mapSpeciesLabDiags(int i) const {return map_species_lab_diags[i];} + int nSpeciesBoostedFrameDiags() const {return nspecies_boosted_frame_diags;} + int mapSpeciesBoostedFrameDiags(int i) const {return map_species_boosted_frame_diags[i];} int doBoostedFrameDiags() const {return do_boosted_frame_diags;} int nSpeciesDepositOnMainGrid () const { @@ -218,8 +218,8 @@ private: void ReadParameters (); - int nspecies_lab_frame_diags = 0; - std::vector<int> map_species_lab_diags; + int nspecies_boosted_frame_diags = 0; + std::vector<int> map_species_boosted_frame_diags; int do_boosted_frame_diags = 0; // runtime parameters diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index ea87e2d5b..6d618c096 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -31,25 +31,25 @@ MultiParticleContainer::MultiParticleContainer (AmrCore* amr_core) pc_tmp.reset(new PhysicalParticleContainer(amr_core)); - // Compute the number of species for which mab frame data is dumped + // Compute the number of species for which lab-frame data is dumped // nspecies_lab_frame_diags, and map their ID to MultiParticleContainer // particle IDs in map_species_lab_diags. - map_species_lab_diags.resize(nspecies); - nspecies_lab_frame_diags = 0; + map_species_boosted_frame_diags.resize(nspecies); + nspecies_boosted_frame_diags = 0; for (int i=0; i<nspecies; i++){ auto& pc = allcontainers[i]; if (pc->do_boosted_frame_diags){ - map_species_lab_diags[nspecies_lab_frame_diags] = i; + map_species_boosted_frame_diags[nspecies_boosted_frame_diags] = i; do_boosted_frame_diags = 1; - nspecies_lab_frame_diags += 1; + nspecies_boosted_frame_diags += 1; } } if (WarpX::do_boosted_frame_diagnostic && do_boosted_frame_diags) { - for (int i = 0; i < nspecies_lab_frame_diags; ++i) + for (int i = 0; i < nspecies_boosted_frame_diags; ++i) { - int is = map_species_lab_diags[i]; + int is = map_species_boosted_frame_diags[i]; allcontainers[is]->AddRealComp("xold"); allcontainers[is]->AddRealComp("yold"); allcontainers[is]->AddRealComp("zold"); @@ -392,8 +392,8 @@ MultiParticleContainer BL_PROFILE("MultiParticleContainer::GetLabFrameData"); // Loop over particle species - for (int i = 0; i < nspecies_lab_frame_diags; ++i){ - int isp = map_species_lab_diags[i]; + for (int i = 0; i < nspecies_boosted_frame_diags; ++i){ + int isp = map_species_boosted_frame_diags[i]; WarpXParticleContainer* pc = allcontainers[isp].get(); WarpXParticleContainer::DiagnosticParticles diagnostic_particles; pc->GetParticleSlice(direction, z_old, z_new, t_boost, t_lab, dt, diagnostic_particles); |