diff options
author | 2020-08-24 23:14:30 +0200 | |
---|---|---|
committer | 2020-08-24 14:14:30 -0700 | |
commit | bb58c764f9f21f8baac5e2fb1d81fed4983d1242 (patch) | |
tree | 3e1f5914d8f1e2be1168b79509718719745ebb93 /Source/FieldSolver | |
parent | 78f9be325d894bbae867aa279efdfd2212690825 (diff) | |
download | WarpX-bb58c764f9f21f8baac5e2fb1d81fed4983d1242.tar.gz WarpX-bb58c764f9f21f8baac5e2fb1d81fed4983d1242.tar.zst WarpX-bb58c764f9f21f8baac5e2fb1d81fed4983d1242.zip |
Fix some warnings (#1239)
This PR fixes the source of several compilation warnings.
Co-authored-by: Axel Huebl <axel.huebl@plasma.ninja>
Diffstat (limited to 'Source/FieldSolver')
12 files changed, 76 insertions, 36 deletions
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H index d5b567bc1..89370c57b 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianCKCAlgorithm.H @@ -13,6 +13,7 @@ #include <AMReX_REAL.H> #include <AMReX_Array4.H> #include <AMReX_Gpu.H> +#include <AMReX.H> #include <algorithm> #include <array> @@ -112,7 +113,7 @@ struct CartesianCKCAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real UpwardDx ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_x, int const n_coefs_x, + amrex::Real const * const coefs_x, int const /*n_coefs_x*/, int const i, int const j, int const k, int const ncomp=0 ) { amrex::Real const alphax = coefs_x[1]; @@ -145,7 +146,7 @@ struct CartesianCKCAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real DownwardDx ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_x, int const n_coefs_x, + amrex::Real const * const coefs_x, int const /*n_coefs_x*/, int const i, int const j, int const k, int const ncomp=0 ) { amrex::Real const inv_dx = coefs_x[0]; @@ -176,7 +177,12 @@ struct CartesianCKCAlgorithm { + F(i+1,j+1,k-1,ncomp) - F(i+1,j ,k-1,ncomp) + F(i-1,j+1,k-1,ncomp) - F(i-1,j ,k-1,ncomp)); #elif (defined WARPX_DIM_XZ) - return 0._rt; // 2D Cartesian: derivative along y is 0 + amrex::ignore_unused(F, coefs_y, n_coefs_y, + i, j, k, ncomp); + return 0._rt; // 2D Cartesian: derivative along y is 0 +#else + amrex::ignore_unused(F, coefs_y, n_coefs_y, + i, j, k, ncomp); #endif } @@ -193,7 +199,12 @@ struct CartesianCKCAlgorithm { Real const inv_dy = coefs_y[0]; return inv_dy*( F(i,j,k,ncomp) - F(i,j-1,k,ncomp) ); #elif (defined WARPX_DIM_XZ) + amrex::ignore_unused(F, coefs_y, n_coefs_y, + i, j, k, ncomp); return 0._rt; // 2D Cartesian: derivative along y is 0 +#else + amrex::ignore_unused(F, coefs_y, n_coefs_y, + i, j, k, ncomp); #endif } @@ -202,7 +213,7 @@ struct CartesianCKCAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real UpwardDz ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_z, int const n_coefs_z, + amrex::Real const * const coefs_z, int const /*n_coefs_z*/, int const i, int const j, int const k, int const ncomp=0 ) { using namespace amrex; @@ -234,7 +245,7 @@ struct CartesianCKCAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real DownwardDz ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_z, int const n_coefs_z, + amrex::Real const * const coefs_z, int const /*n_coefs_z*/, int const i, int const j, int const k, int const ncomp=0 ) { amrex::Real const inv_dz = coefs_z[0]; diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H index b0fe4d562..5434f60fb 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianNodalAlgorithm.H @@ -13,6 +13,7 @@ #include <AMReX_REAL.H> #include <AMReX_Array4.H> #include <AMReX_Gpu.H> +#include <AMReX.H> #include <array> #include <cmath> @@ -61,7 +62,7 @@ struct CartesianNodalAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real UpwardDx ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_x, int const n_coefs_x, + amrex::Real const * const coefs_x, int const /*n_coefs_x*/, int const i, int const j, int const k, int const ncomp=0 ) { using namespace amrex; @@ -90,7 +91,7 @@ struct CartesianNodalAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real UpwardDy ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_y, int const n_coefs_y, + amrex::Real const * const coefs_y, int const /*n_coefs_y*/, int const i, int const j, int const k, int const ncomp=0 ) { using namespace amrex; @@ -98,6 +99,7 @@ struct CartesianNodalAlgorithm { Real const inv_dy = coefs_y[0]; return 0.5_rt*inv_dy*( F(i,j+1,k,ncomp) - F(i,j-1,k,ncomp) ); #elif (defined WARPX_DIM_XZ) + ignore_unused(i, j, k, coefs_y, ncomp, F); return 0._rt; // 2D Cartesian: derivative along y is 0 #endif } @@ -123,7 +125,7 @@ struct CartesianNodalAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real UpwardDz ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_z, int const n_coefs_z, + amrex::Real const * const coefs_z, int const /*n_coefs_z*/, int const i, int const j, int const k, int const ncomp=0 ) { using namespace amrex; diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H index 29e3d710e..a4a94c535 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CartesianYeeAlgorithm.H @@ -10,6 +10,7 @@ #include "Utils/WarpXConst.H" +#include <AMReX.H> #include <AMReX_REAL.H> #include <AMReX_Array4.H> #include <AMReX_Gpu.H> @@ -58,7 +59,7 @@ struct CartesianYeeAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real UpwardDx ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_x, int const n_coefs_x, + amrex::Real const * const coefs_x, int const /*n_coefs_x*/, int const i, int const j, int const k, int const ncomp=0 ) { amrex::Real const inv_dx = coefs_x[0]; @@ -70,7 +71,7 @@ struct CartesianYeeAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real DownwardDx ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_x, int const n_coefs_x, + amrex::Real const * const coefs_x, int const /*n_coefs_x*/, int const i, int const j, int const k, int const ncomp=0 ) { amrex::Real const inv_dx = coefs_x[0]; @@ -90,7 +91,12 @@ struct CartesianYeeAlgorithm { Real const inv_dy = coefs_y[0]; return inv_dy*( F(i,j+1,k,ncomp) - F(i,j,k,ncomp) ); #elif (defined WARPX_DIM_XZ) + amrex::ignore_unused(F, coefs_y, n_coefs_y, + i, j, k, ncomp); return 0._rt; // 2D Cartesian: derivative along y is 0 +#else + amrex::ignore_unused(F, coefs_y, n_coefs_y, + i, j, k, ncomp); #endif } @@ -107,7 +113,12 @@ struct CartesianYeeAlgorithm { Real const inv_dy = coefs_y[0]; return inv_dy*( F(i,j,k,ncomp) - F(i,j-1,k,ncomp) ); #elif (defined WARPX_DIM_XZ) + amrex::ignore_unused(F, coefs_y, n_coefs_y, + i, j, k, ncomp); return 0._rt; // 2D Cartesian: derivative along y is 0 +#else + amrex::ignore_unused(F, coefs_y, n_coefs_y, + i, j, k, ncomp); #endif } @@ -116,7 +127,7 @@ struct CartesianYeeAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real UpwardDz ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_z, int const n_coefs_z, + amrex::Real const * const coefs_z, int const /*n_coefs_z*/, int const i, int const j, int const k, int const ncomp=0 ) { using namespace amrex; @@ -133,7 +144,7 @@ struct CartesianYeeAlgorithm { AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE static amrex::Real DownwardDz ( amrex::Array4<amrex::Real> const& F, - amrex::Real const * const coefs_z, int const n_coefs_z, + amrex::Real const * const coefs_z, int const /*n_coefs_z*/, int const i, int const j, int const k, int const ncomp=0 ) { using namespace amrex; diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/AvgGalileanAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/AvgGalileanAlgorithm.cpp index e5fbc8261..de02c0970 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/AvgGalileanAlgorithm.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/AvgGalileanAlgorithm.cpp @@ -225,7 +225,7 @@ void AvgGalileanAlgorithm::InitializeSpectralCoefficients( }); } -}; +} /* Advance the E and B field in spectral space (stored in `f`) * over one time step */ @@ -368,19 +368,19 @@ AvgGalileanAlgorithm::pushSpectralFields(SpectralFieldData& f) const{ + A1*I*(kx*Jy - ky*Jx)*inv_ep0; }); } -}; +} void -AvgGalileanAlgorithm::CurrentCorrection (SpectralFieldData& field_data, - std::array<std::unique_ptr<amrex::MultiFab>,3>& current, - const std::unique_ptr<amrex::MultiFab>& rho) +AvgGalileanAlgorithm::CurrentCorrection (SpectralFieldData& /*field_data*/, + std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/, + const std::unique_ptr<amrex::MultiFab>& /*rho*/) { amrex::Abort("Current correction not implemented for averaged Galilean PSATD"); } void -AvgGalileanAlgorithm::VayDeposition (SpectralFieldData& field_data, - std::array<std::unique_ptr<amrex::MultiFab>,3>& current) +AvgGalileanAlgorithm::VayDeposition (SpectralFieldData& /*field_data*/, + std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/) { amrex::Abort("Vay deposition not implemented for averaged Galilean PSATD"); } diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp index 4bc147cd8..e1be557fe 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp @@ -103,7 +103,7 @@ PMLPsatdAlgorithm::pushSpectralFields(SpectralFieldData& f) const{ fields(i,j,k,Idx::Bzy) = C*fields(i,j,k,Idx::Bzy) + S_ck*I*ky*Ex_old; }); } -}; +} void PMLPsatdAlgorithm::InitializeSpectralCoefficients ( const SpectralKSpace& spectral_kspace, @@ -153,19 +153,19 @@ void PMLPsatdAlgorithm::InitializeSpectralCoefficients ( } }); } -}; +} void -PMLPsatdAlgorithm::CurrentCorrection (SpectralFieldData& field_data, - std::array<std::unique_ptr<amrex::MultiFab>,3>& current, - const std::unique_ptr<amrex::MultiFab>& rho) +PMLPsatdAlgorithm::CurrentCorrection (SpectralFieldData& /*field_data*/, + std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/, + const std::unique_ptr<amrex::MultiFab>& /*rho*/) { amrex::Abort("Current correction not implemented for PML PSATD"); } void -PMLPsatdAlgorithm::VayDeposition (SpectralFieldData& field_data, - std::array<std::unique_ptr<amrex::MultiFab>,3>& current) +PMLPsatdAlgorithm::VayDeposition (SpectralFieldData& /*field_data*/, + std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/) { amrex::Abort("Vay deposition not implemented for PML PSATD"); } diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H index 73ad773f3..3e909145d 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H @@ -10,6 +10,7 @@ #include "FieldSolver/SpectralSolver/SpectralKSpace.H" #include "FieldSolver/SpectralSolver/SpectralFieldData.H" +#include <AMReX.H> #if WARPX_USE_PSATD @@ -29,7 +30,7 @@ class SpectralBaseAlgorithm // The destructor should also be a virtual function, so that // a pointer to subclass of `SpectraBaseAlgorithm` actually // calls the subclass's destructor. - virtual ~SpectralBaseAlgorithm() {}; + virtual ~SpectralBaseAlgorithm() {} /** * \brief Virtual function for current correction in Fourier space @@ -84,7 +85,11 @@ class SpectralBaseAlgorithm #else modified_kz_vec(spectral_kspace.getModifiedKComponent(dm,1,norder_z,nodal)) #endif - {}; + { +#if (AMREX_SPACEDIM!=3) + amrex::ignore_unused(norder_y); +#endif + } // Modified finite-order vectors KVectorComponent modified_kx_vec; diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp index 73a0bb9af..3354384f0 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp @@ -66,4 +66,4 @@ SpectralBaseAlgorithm::ComputeSpectralDivE ( // Backward Fourier transform field_data.BackwardTransform( divE, Idx::divE, 0 ); -}; +} diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H index d41e05a73..01bbb4b35 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H +++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H @@ -39,7 +39,7 @@ class SpectralKSpace { public: amrex::BoxArray spectralspace_ba; - SpectralKSpace() : dx(amrex::RealVect::Zero) {}; + SpectralKSpace() : dx(amrex::RealVect::Zero) {} SpectralKSpace( const amrex::BoxArray& realspace_ba, const amrex::DistributionMapping& dm, const amrex::RealVect realspace_dx ); diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp index 480e915a9..2c60cdc38 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp @@ -149,8 +149,10 @@ SpectralKSpace::getSpectralShiftFactor( const DistributionMapping& dm, case ShiftType::TransformToCellCentered: sign = 1.; } const Complex I{0,1}; - for (int i=0; i<k.size(); i++ ){ - shift[i] = exp( I*sign*k[i]*0.5_rt*dx[i_dim]); + int i = 0; + for (auto const& kv : k){ + shift[i] = exp( I*sign*kv*0.5_rt*dx[i_dim]); + i++; } } return shift_factor; @@ -187,8 +189,10 @@ SpectralKSpace::getModifiedKComponent( const DistributionMapping& dm, modified_k.resize( k.size() ); // Fill the modified k vector - for (int i=0; i<k.size(); i++ ){ + int i = 0; + for (auto const& kv : k){ modified_k[i] = k[i]; // infinite-order case. + i++; } } } else { @@ -207,7 +211,8 @@ SpectralKSpace::getModifiedKComponent( const DistributionMapping& dm, modified_k.resize( k.size() ); // Fill the modified k vector - for (int i=0; i<k.size(); i++ ){ + int i = 0; + for (auto const& kv : k){ modified_k[i] = 0; for (int n=1; n<stencil_coef.size(); n++){ if (nodal){ @@ -218,6 +223,7 @@ SpectralKSpace::getModifiedKComponent( const DistributionMapping& dm, std::sin( k[i]*(n-0.5)*delta_x )/( (n-0.5)*delta_x ); } } + i++; } // By construction, at finite order and for a nodal grid, diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H index e7c336eb8..6e3338fa8 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H +++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H @@ -67,7 +67,7 @@ class SpectralSolver void ComputeSpectralDivE ( const std::array<std::unique_ptr<amrex::MultiFab>,3>& Efield, amrex::MultiFab& divE ) { algorithm->ComputeSpectralDivE( field_data, Efield, divE ); - }; + } /** * \brief Public interface to call the virtual function \c CurrentCorrection, @@ -82,7 +82,7 @@ class SpectralSolver void CurrentCorrection ( std::array<std::unique_ptr<amrex::MultiFab>,3>& current, const std::unique_ptr<amrex::MultiFab>& rho ) { algorithm->CurrentCorrection( field_data, current, rho ); - }; + } /** * \brief Public interface to call the virtual function \c VayDeposition, diff --git a/Source/FieldSolver/WarpX_FDTD.H b/Source/FieldSolver/WarpX_FDTD.H index a49da2e08..2ac27227d 100644 --- a/Source/FieldSolver/WarpX_FDTD.H +++ b/Source/FieldSolver/WarpX_FDTD.H @@ -7,6 +7,7 @@ #ifndef WARPX_FDTD_H_ #define WARPX_FDTD_H_ +#include <AMReX.H> #include <AMReX_FArrayBox.H> AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE @@ -30,11 +31,13 @@ void warpx_computedivb(int i, int j, int k, int dcomp, #elif defined WARPX_DIM_XZ divB(i,j,0,dcomp) = (Bx(i+1,j ,0) - Bx(i,j,0))*dxinv + (Bz(i ,j+1,0) - Bz(i,j,0))*dzinv; + amrex::ignore_unused(k, By, dyinv); #elif defined WARPX_DIM_RZ const amrex::Real ru = 1. + 0.5/(rmin*dxinv + i + 0.5); const amrex::Real rd = 1. - 0.5/(rmin*dxinv + i + 0.5); divB(i,j,0,dcomp) = (ru*Bx(i+1,j,0) - rd*Bx(i,j,0))*dxinv + (Bz(i,j+1,0) - Bz(i,j,0))*dzinv; + amrex::ignore_unused(k, By, dyinv); #endif } diff --git a/Source/FieldSolver/WarpX_QED_K.H b/Source/FieldSolver/WarpX_QED_K.H index e71f40cfc..929d38be1 100644 --- a/Source/FieldSolver/WarpX_QED_K.H +++ b/Source/FieldSolver/WarpX_QED_K.H @@ -10,6 +10,7 @@ #include "Utils/WarpXConst.H" #include <AMReX_FArrayBox.H> +#include <AMReX.H> #include <cmath> @@ -345,6 +346,7 @@ const amrex::Real dyi = 1./dy; Ez(j,k,0) = Ez(j,k,0) + 0.5_rt*dt*dEz; + amrex::ignore_unused(l, dy); #endif } |