aboutsummaryrefslogtreecommitdiff
path: root/Source/Particles/MultiParticleContainer.cpp
diff options
context:
space:
mode:
authorGravatar MaxThevenet <mthevenet@lbl.gov> 2019-09-05 09:05:43 -0700
committerGravatar MaxThevenet <mthevenet@lbl.gov> 2019-09-05 09:05:43 -0700
commit921aabfc512c68faea6d1cce363f1e4ae1452cd2 (patch)
tree01e750cad2a9e3ba7218424e65c175830af88a1c /Source/Particles/MultiParticleContainer.cpp
parentd55fd6f190470cb56cfcbf3435d8b14a3ef597b8 (diff)
parentb93dce4d62b9a3014641f0df551fd7de453126ba (diff)
downloadWarpX-921aabfc512c68faea6d1cce363f1e4ae1452cd2.tar.gz
WarpX-921aabfc512c68faea6d1cce363f1e4ae1452cd2.tar.zst
WarpX-921aabfc512c68faea6d1cce363f1e4ae1452cd2.zip
fix merge conflicts
Diffstat (limited to 'Source/Particles/MultiParticleContainer.cpp')
-rw-r--r--Source/Particles/MultiParticleContainer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index da09adbf2..e8125588d 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -307,7 +307,7 @@ MultiParticleContainer::GetChargeDensity (int lev, bool local)
std::unique_ptr<MultiFab> rho = allcontainers[0]->GetChargeDensity(lev, true);
for (unsigned i = 1, n = allcontainers.size(); i < n; ++i) {
std::unique_ptr<MultiFab> rhoi = allcontainers[i]->GetChargeDensity(lev, true);
- MultiFab::Add(*rho, *rhoi, 0, 0, 1, rho->nGrow());
+ MultiFab::Add(*rho, *rhoi, 0, 0, rho->nComp(), rho->nGrow());
}
if (!local) {
const Geometry& gm = allcontainers[0]->Geom(lev);