Merge branch 'dev' into enable_psatd_mr

1 files changed, 4 insertions, 27 deletions

diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index 9d39ec2f9..982e04e39 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -172,30 +172,6 @@ MultiParticleContainer::EvolveES (const Vector<std::array<std::unique_ptr<MultiF
 }
 
 void
-MultiParticleContainer::Evolve (int lev,
-                                const MultiFab& Ex, const MultiFab& Ey, const MultiFab& Ez,
-                                const MultiFab& Bx, const MultiFab& By, const MultiFab& Bz,
-                                MultiFab& jx, MultiFab& jy, MultiFab& jz,
-                                MultiFab* cjx,  MultiFab* cjy, MultiFab* cjz, 
-                                MultiFab* rho,
-                                const MultiFab* cEx, const MultiFab* cEy, const MultiFab* cEz,
-                                const MultiFab* cBx, const MultiFab* cBy, const MultiFab* cBz,
-                                Real t, Real dt)
-{
-    jx.setVal(0.0);
-    jy.setVal(0.0);
-    jz.setVal(0.0);
-    if (cjx) cjx->setVal(0.0);
-    if (cjy) cjy->setVal(0.0);
-    if (cjz) cjz->setVal(0.0);
-    if (rho) rho->setVal(0.0);
-    for (auto& pc : allcontainers) {
-	pc->Evolve(lev, Ex, Ey, Ez, Bx, By, Bz, jx, jy, jz, cjx, cjy, cjz,
-               rho, cEx, cEy, cEz, cBx, cBy, cBz, t, dt);
-    }    
-}
-
-void
 MultiParticleContainer::PushXES (Real dt)
 {
     for (auto& pc : allcontainers) {
@@ -240,8 +216,9 @@ MultiParticleContainer::sumParticleCharge (bool local)
 
 void
 MultiParticleContainer::FieldGather (int lev,
-                                     const MultiFab& Ex, const MultiFab& Ey, const MultiFab& Ez,
-                                     const MultiFab& Bx, const MultiFab& By, const MultiFab& Bz)
+                                     const MultiFab& Ex, const MultiFab& Ey,
+                                     const MultiFab& Ez, const MultiFab& Bx,
+                                     const MultiFab& By, const MultiFab& Bz)
 {
     for (auto& pc : allcontainers) {
         pc->FieldGather(lev, Ex, Ey, Ez, Bx, By, Bz);
@@ -331,7 +308,7 @@ MultiParticleContainer::RedistributeLocal (const int num_ghost)
 }
 
 Vector<long>
-MultiParticleContainer::NumberOfParticlesInGrid(int lev) const
+MultiParticleContainer::NumberOfParticlesInGrid (int lev) const
 {
     const bool only_valid=true, only_local=true;
     Vector<long> r = allcontainers[0]->NumberOfParticlesInGrid(lev,only_valid,only_local);