Merge branch 'dev' into add_harmonic_beam

1 files changed, 12 insertions, 3 deletions

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index 377d103d1..48b4bbd55 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -30,6 +30,18 @@ Vector<Real> WarpX::E_external_particle(3, 0.0);
 Vector<Real> WarpX::E_external_grid(3, 0.0);
 Vector<Real> WarpX::B_external_grid(3, 0.0);
 
+std::string WarpX::B_ext_grid_s = "default";
+std::string WarpX::E_ext_grid_s = "default";
+
+// Parser for B_external on the grid
+std::string WarpX::str_Bx_ext_grid_function;
+std::string WarpX::str_By_ext_grid_function;
+std::string WarpX::str_Bz_ext_grid_function;
+// Parser for E_external on the grid
+std::string WarpX::str_Ex_ext_grid_function;
+std::string WarpX::str_Ey_ext_grid_function;
+std::string WarpX::str_Ez_ext_grid_function;
+
 int WarpX::do_moving_window = 0;
 int WarpX::moving_window_dir = -1;
 Real WarpX::moving_window_v = std::numeric_limits<amrex::Real>::max();
@@ -309,9 +321,6 @@ WarpX::ReadParameters ()
         pp.queryarr("B_external_particle", B_external_particle);
         pp.queryarr("E_external_particle", E_external_particle);
 
-        pp.queryarr("E_external_grid", E_external_grid);
-        pp.queryarr("B_external_grid", B_external_grid);
-
         pp.query("do_moving_window", do_moving_window);
         if (do_moving_window)
         {