diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-10-28 16:19:16 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-10-28 16:19:16 -0700 |
| commit | 99823aa7fe9cd7d9ea402d551efc30e7c41c59f1 (patch) | |
| tree | cba11dc88b17f8701e06b650258c10142ca70195 /Source/Utils/WarpXMovingWindow.cpp | |
| parent | 5df58955e32bbd1e2499e484ab50144ec10a9e94 (diff) | |
| parent | f326192ee5140278c6061b1171b98c6a0f932320 (diff) | |
| download | WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.tar.gz WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.tar.zst WarpX-99823aa7fe9cd7d9ea402d551efc30e7c41c59f1.zip | |
resolve merge conflicts
Diffstat (limited to 'Source/Utils/WarpXMovingWindow.cpp')
| -rw-r--r-- | Source/Utils/WarpXMovingWindow.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp index f84701a02..c577da7f3 100644 --- a/Source/Utils/WarpXMovingWindow.cpp +++ b/Source/Utils/WarpXMovingWindow.cpp @@ -99,8 +99,8 @@ WarpX::MoveWindow (bool move_j) for (int dim = 0; dim < 3; ++dim) { // Fine grid - shiftMF(*Bfield_fp[lev][dim], geom[lev], num_shift, dir); - shiftMF(*Efield_fp[lev][dim], geom[lev], num_shift, dir); + 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]); if (move_j) { shiftMF(*current_fp[lev][dim], geom[lev], num_shift, dir); } @@ -113,8 +113,8 @@ WarpX::MoveWindow (bool move_j) if (lev > 0) { // Coarse grid - shiftMF(*Bfield_cp[lev][dim], geom[lev-1], num_shift_crse, dir); - shiftMF(*Efield_cp[lev][dim], geom[lev-1], num_shift_crse, dir); + 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]); shiftMF(*Bfield_aux[lev][dim], geom[lev], num_shift, dir); shiftMF(*Efield_aux[lev][dim], geom[lev], num_shift, dir); if (move_j) { @@ -203,7 +203,8 @@ WarpX::MoveWindow (bool move_j) } void -WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir) +WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir, + amrex::Real external_field) { BL_PROFILE("WarpX::shiftMF()"); const BoxArray& ba = mf.boxArray(); @@ -257,7 +258,7 @@ WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir) if (outbox.ok()) { AMREX_PARALLEL_FOR_4D ( outbox, nc, i, j, k, n, { - srcfab(i,j,k,n) = 0.0; + srcfab(i,j,k,n) = external_field; }); } |