Use fewer guard cells for deposition (#1368)

* Use fewer guard cells for deposition

* Update some CI benchmarks

* Revert "Update some CI benchmarks"

This reverts commit 2f40062557d75e3f6b2d3ba284332b8a92a0d404.

* Check if shapes and guard cells are compatible only for rho

* Do not allocate one extra guard cell for J

* Add more relaxed check on shapes and guard cells for J

1 files changed, 3 insertions, 2 deletions

diff --git a/Source/FieldSolver/ElectrostaticSolver.cpp b/Source/FieldSolver/ElectrostaticSolver.cpp
index 676d89b1f..25f672f90 100644
--- a/Source/FieldSolver/ElectrostaticSolver.cpp
+++ b/Source/FieldSolver/ElectrostaticSolver.cpp
@@ -47,11 +47,12 @@ WarpX::AddSpaceChargeField (WarpXParticleContainer& pc)
     const int num_levels = max_level + 1;
     Vector<std::unique_ptr<MultiFab> > rho(num_levels);
     Vector<std::unique_ptr<MultiFab> > phi(num_levels);
-    const int ng = WarpX::nox;
+    // Use number of guard cells used for local deposition of rho
+    const int ng = guard_cells.ng_depos_rho.max();
     for (int lev = 0; lev <= max_level; lev++) {
         BoxArray nba = boxArray(lev);
         nba.surroundingNodes();
-        rho[lev].reset(new MultiFab(nba, dmap[lev], 1, ng)); // Make ng big enough/use rho from sim
+        rho[lev].reset(new MultiFab(nba, dmap[lev], 1, ng));
         phi[lev].reset(new MultiFab(nba, dmap[lev], 1, 1));
         phi[lev]->setVal(0.);
     }