diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2018-12-11 10:37:21 -0800 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2018-12-11 10:37:21 -0800 |
| commit | b53d4a7ea5c3963e16727aafdbda01771af04c0d (patch) | |
| tree | 33ddccf2ceb4ae6670baa4ed31b9b97cb7035473 /Source/ParticleContainer.cpp | |
| parent | 4e4a84aba36b2d2168cf41077f596549180f0dd9 (diff) | |
| download | WarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.tar.gz WarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.tar.zst WarpX-b53d4a7ea5c3963e16727aafdbda01771af04c0d.zip | |
fix conflicts for merge revert
Diffstat (limited to 'Source/ParticleContainer.cpp')
| -rw-r--r-- | Source/ParticleContainer.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/ParticleContainer.cpp b/Source/ParticleContainer.cpp index 8aac692d6..75c13d793 100644 --- a/Source/ParticleContainer.cpp +++ b/Source/ParticleContainer.cpp @@ -69,8 +69,8 @@ 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); + pp.query("use_fdtd_nci_corr", use_fdtd_nci_corr); + pp.query("l_lower_order_in_v", l_lower_order_in_v); initialized = true; } } @@ -261,14 +261,6 @@ MultiParticleContainer::GetChargeDensity (int lev, bool local) } void -MultiParticleContainer::SortParticlesByCell () -{ - for (auto& pc : allcontainers) { - pc->SortParticlesByCell(); - } -} - -void MultiParticleContainer::Redistribute () { for (auto& pc : allcontainers) { |