aboutsummaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorGravatar MaxThevenet <mthevenet@lbl.gov> 2019-04-26 07:41:14 -0700
committerGravatar MaxThevenet <mthevenet@lbl.gov> 2019-04-26 07:41:14 -0700
commit8da49069958472c566f8ab1eedf17976b3a78b0f (patch)
tree81719716fdc87227e70feb19258dd7d6683ea525 /Source
parenta8b2f0c88434f08955399ca6dfdbc551979717f2 (diff)
downloadWarpX-8da49069958472c566f8ab1eedf17976b3a78b0f.tar.gz
WarpX-8da49069958472c566f8ab1eedf17976b3a78b0f.tar.zst
WarpX-8da49069958472c566f8ab1eedf17976b3a78b0f.zip
change ParmParse param from lasers to antennas
Diffstat (limited to 'Source')
-rw-r--r--Source/Particles/MultiParticleContainer.H4
-rw-r--r--Source/Particles/MultiParticleContainer.cpp18
2 files changed, 11 insertions, 11 deletions
diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
index f3fd522a9..1f8a1b728 100644
--- a/Source/Particles/MultiParticleContainer.H
+++ b/Source/Particles/MultiParticleContainer.H
@@ -192,7 +192,7 @@ protected:
std::vector<std::string> species_names;
- std::vector<std::string> lasers_names;
+ std::vector<std::string> antennas_names;
std::vector<int> deposit_on_main_grid;
@@ -208,7 +208,7 @@ private:
void ReadParameters ();
// runtime parameters
- int nlasers = 0;
+ int nantennas = 0;
int nspecies = 1; // physical particles only. nspecies+nlasers == allcontainers.size().
};
#endif /*WARPX_ParticleContainer_H_*/
diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index 0a8eae8d4..e42fbb9db 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -14,7 +14,7 @@ MultiParticleContainer::MultiParticleContainer (AmrCore* amr_core)
{
ReadParameters();
- allcontainers.resize(nspecies + nlasers);
+ allcontainers.resize(nspecies + nantennas);
for (int i = 0; i < nspecies; ++i) {
if (species_types[i] == PCTypes::Physical) {
allcontainers[i].reset(new PhysicalParticleContainer(amr_core, i, species_names[i]));
@@ -25,8 +25,8 @@ MultiParticleContainer::MultiParticleContainer (AmrCore* amr_core)
allcontainers[i]->deposit_on_main_grid = deposit_on_main_grid[i];
}
- for (int i = nspecies; i < nspecies+nlasers; ++i) {
- allcontainers[i].reset(new LaserParticleContainer(amr_core,i, lasers_names[i-nspecies]));
+ for (int i = nspecies; i < nspecies+nantennas; ++i) {
+ allcontainers[i].reset(new LaserParticleContainer(amr_core,i, antennas_names[i-nspecies]));
}
pc_tmp.reset(new PhysicalParticleContainer(amr_core));
@@ -75,12 +75,12 @@ MultiParticleContainer::ReadParameters ()
pp.query("use_fdtd_nci_corr", WarpX::use_fdtd_nci_corr);
pp.query("l_lower_order_in_v", WarpX::l_lower_order_in_v);
- ParmParse ppl("lasers");
- ppl.query("nlasers", nlasers);
- BL_ASSERT(nlasers >= 0);
- if (nlasers > 0) {
- ppl.getarr("lasers_names", lasers_names);
- BL_ASSERT(lasers_names.size() == nlasers);
+ ParmParse ppl("antennas");
+ ppl.query("nantennas", nantennas);
+ BL_ASSERT(nantennas >= 0);
+ if (nantennas > 0) {
+ ppl.getarr("names", antennas_names);
+ BL_ASSERT(antennas_names.size() == nantennas);
}
initialized = true;