From 1bbfd4691301c541a75e1a9e0c26dd4199d66a16 Mon Sep 17 00:00:00 2001
From: Olga Shapoval <30510597+oshapoval@users.noreply.github.com>
Date: Wed, 18 Aug 2021 16:33:58 -0700
Subject: Bug fixed: looping over all species now within `OneStep_multiJ`
 (#2207)

* Bug fixed: looping over all species now within 'OneStep_multij'

* Bug fixed: looping over all laser particles within DepositCharge in multi-J
---
 Source/Particles/MultiParticleContainer.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'Source/Particles/MultiParticleContainer.cpp')

diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index ec4ffe8e1..4b9624ba8 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -482,10 +482,9 @@ MultiParticleContainer::DepositCurrent (
     }
 
     // Call the deposition kernel for each species
-    for (int ispecies = 0; ispecies < nSpecies(); ispecies++)
+    for (auto& pc : allcontainers)
     {
-        WarpXParticleContainer& species = GetParticleContainer(ispecies);
-        species.DepositCurrent(J, dt, relative_t);
+        pc->DepositCurrent(J, dt, relative_t);
     }
 
 #ifdef WARPX_DIM_RZ
@@ -512,14 +511,13 @@ MultiParticleContainer::DepositCharge (
     if (relative_t != 0.) PushX(relative_t);
 
     // Call the deposition kernel for each species
-    for (int ispecies = 0; ispecies < nSpecies(); ispecies++)
+    for (auto& pc : allcontainers)
     {
-        WarpXParticleContainer& species = GetParticleContainer(ispecies);
         bool const local = true;
         bool const reset = false;
         bool const do_rz_volume_scaling = false;
         bool const interpolate_across_levels = false;
-        species.DepositCharge(rho, local, reset, do_rz_volume_scaling,
+        pc->DepositCharge(rho, local, reset, do_rz_volume_scaling,
                               interpolate_across_levels, icomp);
     }
 
-- 
cgit v1.2.3