From b53d4a7ea5c3963e16727aafdbda01771af04c0d Mon Sep 17 00:00:00 2001 From: MaxThevenet Date: Tue, 11 Dec 2018 10:37:21 -0800 Subject: fix conflicts for merge revert --- Source/ParticleContainer.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Source/ParticleContainer.cpp') 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; } } @@ -260,14 +260,6 @@ MultiParticleContainer::GetChargeDensity (int lev, bool local) return rho; } -void -MultiParticleContainer::SortParticlesByCell () -{ - for (auto& pc : allcontainers) { - pc->SortParticlesByCell(); - } -} - void MultiParticleContainer::Redistribute () { -- cgit v1.2.3