Merge pull request #465 from RemiLehe/poisson

Implement space-charge initialization (non-relativistic, single-level)

1 files changed, 15 insertions, 3 deletions

diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index d22de00e0..09f51ef49 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -8,7 +8,7 @@
 #include <WarpX_f.H>
 #include <WarpX.H>
 #include <WarpXAlgorithmSelection.H>
-
+#include <WarpXComm.H>
 // Import low-level single-particle kernels
 #include <GetAndSetPosition.H>
 #include <UpdatePosition.H>
@@ -501,11 +501,16 @@ WarpXParticleContainer::DepositCharge (WarpXParIter& pti, RealVector& wp,
 }
 
 void
-WarpXParticleContainer::DepositCharge (Vector<std::unique_ptr<MultiFab> >& rho, bool local)
+WarpXParticleContainer::DepositCharge (Vector<std::unique_ptr<MultiFab> >& rho,
+                                        bool local, bool reset,
+                                        bool do_rz_volume_scaling)
 {
     // Loop over the refinement levels
     int const finest_level = rho.size() - 1;
-    for (int lev = 0; lev < finest_level; ++lev) {
+    for (int lev = 0; lev <= finest_level; ++lev) {
+
+        // Reset the `rho` array if `reset` is True
+        if (reset) rho[lev]->setVal(0.0, rho[lev]->nGrow());
 
         // Loop over particle tiles and deposit charge on each level
 #ifdef _OPENMP
@@ -534,6 +539,13 @@ WarpXParticleContainer::DepositCharge (Vector<std::unique_ptr<MultiFab> >& rho,
 #ifdef _OPENMP
         }
 #endif
+
+#ifdef WARPX_DIM_RZ
+        if (do_rz_volume_scaling) {
+            WarpX::GetInstance().ApplyInverseVolumeScalingToChargeDensity(rho[lev].get(), lev);
+        }
+#endif
+
         // Exchange guard cells
         if (!local) rho[lev]->SumBoundary( m_gdb->Geom(lev).periodicity() );
     }