fix merge conflicts

src/Hipace.cpp

@@ -376,8 +376,9 @@ Hipace::SolveOneSlice (int islice, int lev, const int ibox,
     amrex::MultiFab rho(m_fields.getSlices(lev, WhichSlice::This), amrex::make_alias,
                         Comps[WhichSlice::This]["rho"], 1);
 
-    DepositCurrent(m_plasma_container, m_fields, WhichSlice::This, false, true,
-                   true, true, false, geom[lev], lev);
+    m_multi_plasma.DepositCurrent(
+        m_fields, WhichSlice::This, false, true, true, true, false, geom[lev], lev);
+
     m_fields.AddRhoIons(lev);
 
     // need to exchange jx jy jz rho
@@ -776,8 +777,9 @@ Hipace::PredictorCorrectorLoopToSolveBxBy (const int islice, const int lev)
         m_multi_plasma.AdvanceParticles(m_fields, geom[lev], true, true, false, false, lev);
 
         /* deposit current to next slice */
-        DepositCurrent(m_plasma_container, m_fields, WhichSlice::Next, true,
-                       true, false, false, false, geom[lev], lev);
+        m_multi_plasma.DepositCurrent(
+            m_fields, WhichSlice::Next, true, true, false, false, false, geom[lev], lev);
+
         amrex::ParallelContext::push(m_comm_xy);
         // need to exchange jx jy jz rho
         amrex::MultiFab j_slice_next(m_fields.getSlices(lev, WhichSlice::Next),

src/particles/MultiPlasma.H

@@ -35,12 +35,13 @@ public:
      * \param[in] deposit_jx_jy if true, deposit to jx and jy
      * \param[in] deposit_jz if true, deposit to jz
      * \param[in] deposit_rho if true, deposit to rho
+     * \param[in] deposit_j_squared if true, deposit jxx, jxy, jyy
      * \param[in] gm Geometry of the simulation, to get the cell size etc.
      * \param[in] lev MR level
      */
     void DepositCurrent (
         Fields & fields, int which_slice, bool temp_slice, bool deposit_jx_jy, bool deposit_jz,
-        bool deposit_rho, amrex::Geometry const& gm, int const lev);
+        bool deposit_rho, bool deposit_j_squared, amrex::Geometry const& gm, int const lev);
 
     /** \brief Return max density, to compute the adaptive time step.
      *

src/particles/MultiPlasma.cpp

@@ -40,10 +40,11 @@ MultiPlasma::maxDensity ()
 void
 MultiPlasma::DepositCurrent (
     Fields & fields, int which_slice, bool temp_slice, bool deposit_jx_jy, bool deposit_jz,
-    bool deposit_rho, amrex::Geometry const& gm, int const lev)
+    bool deposit_rho, bool deposit_j_squared, amrex::Geometry const& gm, int const lev)
 {
     for (auto& plasma : m_all_plasmas) {
-        ::DepositCurrent(plasma, fields, which_slice, temp_slice, deposit_jx_jy, deposit_jz, deposit_rho, gm, lev);
+        ::DepositCurrent(plasma, fields, which_slice, temp_slice, deposit_jx_jy, deposit_jz,
+                         deposit_rho, deposit_j_squared, gm, lev);
     }
 }
 
@@ -71,7 +72,7 @@ MultiPlasma::DepositNeutralizingBackground (
 {
     for (auto& plasma : m_all_plasmas) {
         if (plasma.m_neutralize_background){
-            ::DepositCurrent(plasma, fields, which_slice, false, false, false, true, gm, lev);
+            ::DepositCurrent(plasma, fields, which_slice, false, false, false, true, false, gm, lev);
         }
     }
 }