diff options
Diffstat (limited to 'Source/FieldSolver')
6 files changed, 14 insertions, 12 deletions
diff --git a/Source/FieldSolver/ElectrostaticSolver.H b/Source/FieldSolver/ElectrostaticSolver.H index 7de7a1bb5..250315617 100644 --- a/Source/FieldSolver/ElectrostaticSolver.H +++ b/Source/FieldSolver/ElectrostaticSolver.H @@ -14,6 +14,8 @@ #include <AMReX_REAL.H> #include <AMReX_Parser.H> +#include <utility> + namespace ElectrostaticSolver { struct PhiCalculatorEB { @@ -102,7 +104,7 @@ namespace ElectrostaticSolver { public: EBCalcEfromPhiPerLevel(amrex::Vector<amrex::Array<amrex::MultiFab *, AMREX_SPACEDIM> > e_field) - : m_e_field(e_field) {} + : m_e_field(std::move(e_field)) {} void operator()(amrex::MLMG & mlmg, int const lev) { using namespace amrex::literals; diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H index e3af70a0d..737146f24 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H @@ -122,7 +122,7 @@ struct CartesianCKCAlgorithm { */ static amrex::IntVect GetMaxGuardCell () { // The ckc solver requires one guard cell in each dimension - return (amrex::IntVect(AMREX_D_DECL(1,1,1))); + return amrex::IntVect{AMREX_D_DECL(1,1,1)}; } /** diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H index 01d83804b..b693ed878 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H @@ -60,7 +60,7 @@ struct CartesianNodalAlgorithm { */ static amrex::IntVect GetMaxGuardCell () { // The nodal solver requires one guard cell in each dimension - return (amrex::IntVect(AMREX_D_DECL(1,1,1))); + return amrex::IntVect{AMREX_D_DECL(1,1,1)}; } /** diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H index f2c8553d5..b762530e1 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H @@ -60,7 +60,7 @@ struct CartesianYeeAlgorithm { */ static amrex::IntVect GetMaxGuardCell () { // The yee solver requires one guard cell in each dimension - return (amrex::IntVect(AMREX_D_DECL(1,1,1))); + return amrex::IntVect{AMREX_D_DECL(1,1,1)}; } /** diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H index ad8194a13..b6c5c0a8c 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H @@ -65,7 +65,7 @@ struct CylindricalYeeAlgorithm { */ static amrex::IntVect GetMaxGuardCell () { // The cylindrical solver requires one guard cell in each dimension - return (amrex::IntVect(AMREX_D_DECL(1,1,1))); + return amrex::IntVect{AMREX_D_DECL(1,1,1)}; } /** Applies the differential operator `1/r * d(rF)/dr`, diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp index 37bbc2ca3..075645233 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp @@ -32,18 +32,18 @@ PsatdAlgorithmComoving::PsatdAlgorithmComoving (const SpectralKSpace& spectral_k const amrex::Real dt, const bool update_with_rho) // Members initialization - : SpectralBaseAlgorithm(spectral_kspace, dm, spectral_index, norder_x, norder_y, norder_z, grid_type), + : SpectralBaseAlgorithm{spectral_kspace, dm, spectral_index, norder_x, norder_y, norder_z, grid_type}, // Initialize the infinite-order k vectors (the argument n_order = -1 selects // the infinite order option, the argument grid_type=GridType::Staggered is then irrelevant) - kx_vec(spectral_kspace.getModifiedKComponent(dm, 0, -1, GridType::Staggered)), + kx_vec{spectral_kspace.getModifiedKComponent(dm, 0, -1, GridType::Staggered)}, #if defined(WARPX_DIM_3D) - ky_vec(spectral_kspace.getModifiedKComponent(dm, 1, -1, GridType::Staggered)), - kz_vec(spectral_kspace.getModifiedKComponent(dm, 2, -1, GridType::Staggered)), + ky_vec{spectral_kspace.getModifiedKComponent(dm, 1, -1, GridType::Staggered)}, + kz_vec{spectral_kspace.getModifiedKComponent(dm, 2, -1, GridType::Staggered)}, #else - kz_vec(spectral_kspace.getModifiedKComponent(dm, 1, -1, GridType::Staggered)), + kz_vec{spectral_kspace.getModifiedKComponent(dm, 1, -1, GridType::Staggered)}, #endif - m_v_comoving(v_comoving), - m_dt(dt) + m_v_comoving{v_comoving}, + m_dt{dt} { amrex::ignore_unused(update_with_rho); |