Merge branch 'dev' of https://github.com/ECP-WarpX/WarpX into cleanup_examples_input_files: synchronize with 'dev' branch before requesting PR review.

1 files changed, 65 insertions, 12 deletions

diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp
index c577da7f3..e05a64bfe 100644
--- a/Source/Utils/WarpXMovingWindow.cpp
+++ b/Source/Utils/WarpXMovingWindow.cpp
@@ -1,4 +1,5 @@
 #include <WarpX.H>
+#include <WarpXUtil.H>
 #include <WarpXConst.H>
 
 using namespace amrex;
@@ -97,10 +98,25 @@ WarpX::MoveWindow (bool move_j)
 
         // Shift each component of vector fields (E, B, j)
         for (int dim = 0; dim < 3; ++dim) {
-
             // Fine grid
-            shiftMF(*Bfield_fp[lev][dim], geom[lev], num_shift, dir, B_external_grid[dim]);
-            shiftMF(*Efield_fp[lev][dim], geom[lev], num_shift, dir, E_external_grid[dim]);
+            ParserWrapper *Bfield_parser;
+            ParserWrapper *Efield_parser;
+            bool use_Bparser = false;
+            bool use_Eparser = false;
+            if (B_ext_grid_s == "parse_b_ext_grid_function") {
+                use_Bparser = true;
+                if (dim == 0) Bfield_parser = Bxfield_parser.get();
+                if (dim == 1) Bfield_parser = Byfield_parser.get();
+                if (dim == 2) Bfield_parser = Bzfield_parser.get();
+            }
+            if (E_ext_grid_s == "parse_e_ext_grid_function") {
+                use_Eparser = true;
+                if (dim == 0) Efield_parser = Exfield_parser.get();
+                if (dim == 1) Efield_parser = Eyfield_parser.get();
+                if (dim == 2) Efield_parser = Ezfield_parser.get();
+            }
+            shiftMF(*Bfield_fp[lev][dim], geom[lev], num_shift, dir, B_external_grid[dim], use_Bparser, Bfield_parser);
+            shiftMF(*Efield_fp[lev][dim], geom[lev], num_shift, dir, E_external_grid[dim], use_Eparser, Efield_parser);
             if (move_j) {
                 shiftMF(*current_fp[lev][dim], geom[lev], num_shift, dir);
             }
@@ -112,9 +128,9 @@ WarpX::MoveWindow (bool move_j)
             }
 
             if (lev > 0) {
-                // Coarse grid
-                shiftMF(*Bfield_cp[lev][dim], geom[lev-1], num_shift_crse, dir, B_external_grid[dim]);
-                shiftMF(*Efield_cp[lev][dim], geom[lev-1], num_shift_crse, dir, E_external_grid[dim]);
+                // coarse grid
+                shiftMF(*Bfield_cp[lev][dim], geom[lev-1], num_shift_crse, dir, B_external_grid[dim], use_Bparser, Bfield_parser);
+                shiftMF(*Efield_cp[lev][dim], geom[lev-1], num_shift_crse, dir, E_external_grid[dim], use_Eparser, Efield_parser);
                 shiftMF(*Bfield_aux[lev][dim], geom[lev], num_shift, dir);
                 shiftMF(*Efield_aux[lev][dim], geom[lev], num_shift, dir);
                 if (move_j) {
@@ -132,7 +148,7 @@ WarpX::MoveWindow (bool move_j)
         // Shift scalar component F for dive cleaning
         if (do_dive_cleaning) {
             // Fine grid
-            shiftMF(*F_fp[lev],   geom[lev], num_shift, dir);
+            shiftMF(*F_fp[lev], geom[lev], num_shift, dir);
             if (do_pml && pml[lev]->ok()) {
                 MultiFab* pml_F = pml[lev]->GetF_fp();
                 shiftMF(*pml_F, geom[lev], num_shift, dir);
@@ -204,7 +220,7 @@ WarpX::MoveWindow (bool move_j)
 
 void
 WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir,
-                amrex::Real external_field)
+                amrex::Real external_field, bool useparser, ParserWrapper *field_parser)
 {
     BL_PROFILE("WarpX::shiftMF()");
     const BoxArray& ba = mf.boxArray();
@@ -246,20 +262,57 @@ WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir,
     shiftiv[dir] = num_shift;
     Dim3 shift = shiftiv.dim3();
 
+    const RealBox& real_box = geom.ProbDomain();
+    const auto dx = geom.CellSizeArray();
+
 #ifdef _OPENMP
 #pragma omp parallel if (Gpu::notInLaunchRegion())
 #endif
+
+
     for (MFIter mfi(tmpmf); mfi.isValid(); ++mfi )
     {
         auto const& dstfab = mf.array(mfi);
         auto const& srcfab = tmpmf.array(mfi);
 
         const Box& outbox = mfi.fabbox() & adjBox;
+
         if (outbox.ok()) {
-            AMREX_PARALLEL_FOR_4D ( outbox, nc, i, j, k, n,
-            {
-                srcfab(i,j,k,n) = external_field;
-            });
+            if (useparser == false) {
+                AMREX_PARALLEL_FOR_4D ( outbox, nc, i, j, k, n,
+                {
+                    srcfab(i,j,k,n) = external_field;
+                });
+            } else if (useparser == true) {
+                // index type of the src mf
+                auto const& mf_IndexType = (tmpmf).ixType();
+                IntVect mf_type(AMREX_D_DECL(0,0,0));
+                for (int idim = 0; idim < AMREX_SPACEDIM; ++idim) {
+                    mf_type[idim] = mf_IndexType.nodeCentered(idim);
+                }
+
+                amrex::ParallelFor (outbox, nc,
+                      [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) noexcept
+                {
+                      // Compute x,y,z co-ordinates based on index type of mf
+                      Real fac_x = (1.0 - mf_type[0]) * dx[0]*0.5;
+                      Real x = i*dx[0] + real_box.lo(0) + fac_x;
+#if (AMREX_SPACEDIM==2)
+                      Real y = 0.0;
+                      Real fac_z = (1.0 - mf_type[1]) * dx[1]*0.5;
+                      Real z = j*dx[1] + real_box.lo(1) + fac_z;
+#else
+                      Real fac_y = (1.0 - mf_type[1]) * dx[1]*0.5;
+                      Real y = j*dx[1] + real_box.lo(1) + fac_y;
+                      Real fac_z = (1.0 - mf_type[2]) * dx[2]*0.5;
+                      Real z = k*dx[2] + real_box.lo(2) + fac_z;
+#endif
+                      srcfab(i,j,k,n) = field_parser->getField(x,y,z);
+                }
+                , amrex::Gpu::numThreadsPerBlockParallelFor() * sizeof(double)*3
+                );
+            }
+
         }
 
         Box dstBox = mf[mfi].box();