diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Diagnostics/SliceDiagnostic.H | 43 | ||||
| -rw-r--r-- | Source/Diagnostics/WarpXIO.cpp | 1 | ||||
| -rw-r--r-- | Source/WarpX.cpp | 3 |
3 files changed, 23 insertions, 24 deletions
diff --git a/Source/Diagnostics/SliceDiagnostic.H b/Source/Diagnostics/SliceDiagnostic.H index d424f8150..86c1794e6 100644 --- a/Source/Diagnostics/SliceDiagnostic.H +++ b/Source/Diagnostics/SliceDiagnostic.H @@ -16,29 +16,30 @@ #include <AMReX_MultiFabUtil.H> #include <AMReX_MultiFabUtil_C.H> -using namespace amrex; - -std::unique_ptr<MultiFab> CreateSlice( const amrex::MultiFab& mf, - const amrex::Vector<Geometry> &dom_geom, - amrex::RealBox &slice_realbox, - amrex::IntVect &slice_cr_ratio ); - - -void CheckSliceInput( const RealBox real_box, RealBox &slice_cc_nd_box, - RealBox &slice_realbox, IntVect &cr_ratio, IntVect slice_cr_ratio, - Vector<Geometry> dom_geom, IntVect const SliceType, IntVect &slice_lo, - IntVect &slice_hi, IntVect &interp_lo); - -void InterpolateSliceValues( MultiFab& smf, IntVect interp_lo, - RealBox slice_realbox, Vector<Geometry> geom, int ncomp, - int nghost, IntVect slice_lo, IntVect slice_hi, - IntVect SliceType, const RealBox real_box); - -void InterpolateLo( const Box& bx, FArrayBox &fabox, IntVect slice_lo, - Vector<Geometry> geom, int idir, IntVect IndType, RealBox slice_realbox, - int srccomp, int ncomp, int nghost, const RealBox real_box); +std::unique_ptr<amrex::MultiFab> CreateSlice( const amrex::MultiFab& mf, + const amrex::Vector<amrex::Geometry> &dom_geom, + amrex::RealBox &slice_realbox, + amrex::IntVect &slice_cr_ratio ); + +void CheckSliceInput( const amrex::RealBox real_box, + amrex::RealBox &slice_cc_nd_box, amrex::RealBox &slice_realbox, + amrex::IntVect &cr_ratio, amrex::IntVect slice_cr_ratio, + amrex::Vector<amrex::Geometry> dom_geom, amrex::IntVect const SliceType, + amrex::IntVect &slice_lo, amrex::IntVect &slice_hi, + amrex::IntVect &interp_lo); + +void InterpolateSliceValues( amrex::MultiFab& smf, + amrex::IntVect interp_lo, amrex::RealBox slice_realbox, + amrex::Vector<amrex::Geometry> geom, int ncomp, int nghost, + amrex::IntVect slice_lo, amrex::IntVect slice_hi, + amrex::IntVect SliceType, const amrex::RealBox real_box); + +void InterpolateLo( const amrex::Box& bx, amrex::FArrayBox &fabox, + amrex::IntVect slice_lo, amrex::Vector<amrex::Geometry> geom, + int idir, amrex::IntVect IndType, amrex::RealBox slice_realbox, + int srccomp, int ncomp, int nghost, const amrex::RealBox real_box); #endif diff --git a/Source/Diagnostics/WarpXIO.cpp b/Source/Diagnostics/WarpXIO.cpp index d8f26e230..6263d2183 100644 --- a/Source/Diagnostics/WarpXIO.cpp +++ b/Source/Diagnostics/WarpXIO.cpp @@ -777,7 +777,6 @@ WarpX::WriteJobInfo (const std::string& dir) const /* \brief * The slice is ouput using visMF and can be visualized used amrvis. - * THe final objective is to use OpenPMD, but, the next PR will have a yt-compliant format. */ void WarpX::WriteSlicePlotFile () const diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp index 2200c6811..813158962 100644 --- a/Source/WarpX.cpp +++ b/Source/WarpX.cpp @@ -542,8 +542,7 @@ WarpX::ReadParameters () pp.query("plot_int",slice_plot_int); slice_realbox.setLo(slice_lo); slice_realbox.setHi(slice_hi); - IntVect slice_loc_ratio(AMREX_D_DECL(1,1,1)); - slice_cr_ratio = slice_loc_ratio; + slice_cr_ratio = IntVect(AMREX_D_DECL(1,1,1)); for (int idim = 0; idim < AMREX_SPACEDIM; ++idim) { if (slice_crse_ratio[idim] > 1 ) { |