diff options
Diffstat (limited to 'Source/Utils')
| -rw-r--r-- | Source/Utils/WarpXMovingWindow.cpp | 2 | ||||
| -rw-r--r-- | Source/Utils/WarpXUtil.cpp | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp index ae781f9aa..06a7d2614 100644 --- a/Source/Utils/WarpXMovingWindow.cpp +++ b/Source/Utils/WarpXMovingWindow.cpp @@ -214,7 +214,7 @@ WarpX::shiftMF (MultiFab& mf, const Geometry& geom, int num_shift, int dir) AMREX_ALWAYS_ASSERT(ng.min() >= num_shift); - MultiFab tmpmf(ba, dm, nc, ng, MFInfo().SetDeviceFab(false)); + MultiFab tmpmf(ba, dm, nc, ng); MultiFab::Copy(tmpmf, mf, 0, 0, nc, ng); tmpmf.FillBoundary(geom.periodicity()); diff --git a/Source/Utils/WarpXUtil.cpp b/Source/Utils/WarpXUtil.cpp index a5ea6d75a..19e898208 100644 --- a/Source/Utils/WarpXUtil.cpp +++ b/Source/Utils/WarpXUtil.cpp @@ -51,16 +51,25 @@ void ConvertLabParamsToBoost() Vector<Real> prob_hi(AMREX_SPACEDIM); Vector<Real> fine_tag_lo(AMREX_SPACEDIM); Vector<Real> fine_tag_hi(AMREX_SPACEDIM); + Vector<Real> slice_lo(AMREX_SPACEDIM); + Vector<Real> slice_hi(AMREX_SPACEDIM); ParmParse pp_geom("geometry"); ParmParse pp_wpx("warpx"); ParmParse pp_amr("amr"); + ParmParse pp_slice("slice"); pp_geom.getarr("prob_lo",prob_lo,0,AMREX_SPACEDIM); BL_ASSERT(prob_lo.size() == AMREX_SPACEDIM); pp_geom.getarr("prob_hi",prob_hi,0,AMREX_SPACEDIM); BL_ASSERT(prob_hi.size() == AMREX_SPACEDIM); + pp_slice.queryarr("dom_lo",slice_lo,0,AMREX_SPACEDIM); + BL_ASSERT(slice_lo.size() == AMREX_SPACEDIM); + pp_slice.queryarr("dom_hi",slice_hi,0,AMREX_SPACEDIM); + BL_ASSERT(slice_hi.size() == AMREX_SPACEDIM); + + pp_amr.query("max_level", max_level); if (max_level > 0){ pp_wpx.getarr("fine_tag_lo", fine_tag_lo); @@ -86,15 +95,22 @@ void ConvertLabParamsToBoost() fine_tag_lo[idim] *= convert_factor; fine_tag_hi[idim] *= convert_factor; } + slice_lo[idim] *= convert_factor; + slice_hi[idim] *= convert_factor; break; } } + pp_geom.addarr("prob_lo", prob_lo); pp_geom.addarr("prob_hi", prob_hi); if (max_level > 0){ pp_wpx.addarr("fine_tag_lo", fine_tag_lo); pp_wpx.addarr("fine_tag_hi", fine_tag_hi); } + + pp_slice.addarr("dom_lo",slice_lo); + pp_slice.addarr("dom_hi",slice_hi); + } /* \brief Function that sets the value of MultiFab MF to zero for z between |