Fix some merge issues

RevathiJambunathan · Dec 30, 2023 · 122cf91 · 122cf91
1 parent 41b59c1
commit 122cf91
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 24 deletions.
diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileStationField.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileStationField.cpp
@@ -177,7 +177,7 @@ void StationFieldLaserProfile::fill_amplitude (
 #elif (AMREX_SPACEDIM == 3)
             auto const yj = (Yp[ip]-plo[1])*dyi;
             auto const j = static_cast<int>(std::floor(yj));
-            amrex::Real const wy = yi - amrex::Real(j);
+            amrex::Real const wy = yj - amrex::Real(j);
             amplitude[ip] = (1._rt-wx)*(1._rt-wy)*a(i  ,j  ,0)
                 +                  wx *(1._rt-wy)*a(i+1,j  ,0)
                 +           (1._rt-wx)*       wy *a(i  ,j+1,0)

diff --git a/Source/Make.WarpX b/Source/Make.WarpX
@@ -331,6 +331,7 @@ $(srcTempDir)/Utils/export.H:
 
 cleanconfig::
 	$(SILENT) $(RM) -r $(srcTempDir)/Utils
+	$(SILENT) $(RM) -r $(srcTempDir)/ablastr
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.rules
 

diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
@@ -2304,13 +2304,13 @@ PhysicalParticleContainer::SplitParticles (int lev)
     long np_split;
     if(split_type==0)
     {
-        #if defined(WARPX_DIM_3D)
+#if defined(WARPX_DIM_3D)
            np_split = 8;
-        #elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ)
+#elif defined(WARPX_DIM_XZ) || defined(WARPX_DIM_RZ)
            np_split = 4;
-        #else
+#else
            np_split = 2;
-        #endif
+#endif
     } else {
         np_split = 2*AMREX_SPACEDIM;
     }

diff --git a/Source/Utils/WarpXUtil.cpp b/Source/Utils/WarpXUtil.cpp
@@ -192,11 +192,13 @@ void ConvertLabParamsToBoost ()
     Vector<int> dim_map {2};
 #endif
 
-    pp_warpx.query("B_ext_grid_init_style", WarpX::B_ext_grid_s);
-    pp_warpx.query("E_ext_grid_init_style", WarpX::E_ext_grid_s);
+    std::string B_ext_grid_s, E_ext_grid_s;
 
-    if ((WarpX::B_ext_grid_s == "impose_field_in_plane") ||
-        (WarpX::E_ext_grid_s == "impose_field_in_plane")) {
+    pp_warpx.query("B_ext_grid_init_style", B_ext_grid_s);
+    pp_warpx.query("E_ext_grid_init_style", E_ext_grid_s);
+
+    if ((B_ext_grid_s == "impose_field_in_plane") ||
+        (E_ext_grid_s == "impose_field_in_plane")) {
         Real zstation;
         Real tmin = std::numeric_limits<Real>::max();
         Real tmax = std::numeric_limits<Real>::lowest();

diff --git a/Source/WarpX.H b/Source/WarpX.H
@@ -147,21 +147,6 @@ public:
      */
     [[nodiscard]] std::string GetAuthors () const { return m_authors; }
 
-    //! Initial electric field on the grid
-    static amrex::Vector<amrex::Real> E_external_grid;
-    //! Initial magnetic field on the grid
-    static amrex::Vector<amrex::Real> B_external_grid;
-
-    //! Initialization type for external magnetic field on the grid
-    static std::string B_ext_grid_s;
-    //! Initialization type for external electric field on the grid
-    static std::string E_ext_grid_s;
-
-    //! Whether to apply the effect of an externally-defined electric field
-    static bool add_external_E_field;
-    //! Whether to apply the effect of an externally-defined magnetic field
-    static bool add_external_B_field;
-
     //! The beginning time of boosted frame simulation
     static inline amrex::Real m_t_boost_offset = 0;