Fix conflicts and compilation errors after rebase

Author: RevathiJambunathan

Source/Evolve/WarpXEvolve.cpp

@@ -296,8 +296,8 @@ WarpX::Evolve (int numsteps)
                 }
             }
         }
-        FillBoundaryE(guard_cells.ng_FieldSolver, IntVect::TheZeroVector());
-        FillBoundaryB(guard_cells.ng_FieldSolver, IntVect::TheZeroVector());
+        FillBoundaryE(guard_cells.ng_FieldSolver);
+        FillBoundaryB(guard_cells.ng_FieldSolver);
 #endif
 
         if (cur_time + dt[0] >= stop_time - 1.e-3*dt[0] || step == numsteps_max-1) {

Source/Particles/Deposition/ChargeDeposition.H

@@ -15,6 +15,9 @@
 #ifdef WARPX_DIM_RZ
 #   include "Utils/WarpX_Complex.H"
 #endif
+#ifdef PULSAR
+    #include "Particles/PulsarParameters.H"
+#endif
 
 #include <AMReX.H>
 

Source/Particles/Deposition/CurrentDeposition.H

@@ -15,6 +15,9 @@
 #ifdef WARPX_DIM_RZ
 #   include "Utils/WarpX_Complex.H"
 #endif
+#ifdef PULSAR
+    #include "Particles/PulsarParameters.H"
+#endif
 
 #include <AMReX.H>
 #include <AMReX_Arena.H>

Source/Particles/Gather/FieldGather.H

@@ -12,6 +12,9 @@
 #include "Particles/Pusher/GetAndSetPosition.H"
 #include "Particles/ShapeFactors.H"
 #include "Utils/WarpX_Complex.H"
+#ifdef PULSAR
+    #include "Particles/PulsarParameters.H"
+#endif
 
 #include <AMReX.H>
 

Source/Particles/Gather/GetExternalFields.cpp

@@ -23,7 +23,7 @@ GetExternalEField::GetExternalEField (const WarpXParIter& a_pti, int a_offset) n
     }
     else if (mypc.m_E_ext_particle_s=="parse_e_ext_particle_function")
     {
-        m_type = Parser;
+        m_type = ExternalFieldInitType::Parser;
         m_time = warpx.gett_new(a_pti.GetLevel());
         m_get_position = GetParticlePosition(a_pti, a_offset);
         m_xfield_partparser = mypc.m_Ex_particle_parser->compile<4>();
@@ -65,7 +65,7 @@ GetExternalBField::GetExternalBField (const WarpXParIter& a_pti, int a_offset) n
     }
     else if (mypc.m_B_ext_particle_s=="parse_b_ext_particle_function")
     {
-        m_type = Parser;
+        m_type = ExternalFieldInitType::Parser;
         m_time = warpx.gett_new(a_pti.GetLevel());
         m_get_position = GetParticlePosition(a_pti, a_offset);
         m_xfield_partparser = mypc.m_Bx_particle_parser->compile<4>();

Source/Particles/MultiParticleContainer.cpp

@@ -166,8 +166,8 @@ MultiParticleContainer::ReadParameters ()
         // is cartesian (default) or spherical
         // For pulsar it is easier to provide (r,theta,phi) components
         // and let the code do the conversion to cartesian
-        pp.query("E_ext_particle_coord", m_E_ext_particle_coord);
-        pp.query("B_ext_particle_coord", m_B_ext_particle_coord);
+        pp_particles.query("E_ext_particle_coord", m_E_ext_particle_coord);
+        pp_particles.query("B_ext_particle_coord", m_B_ext_particle_coord);
 #endif
 
         // if the input string for B_external on particles is "constant"