diff options
Diffstat (limited to 'Source')
50 files changed, 213 insertions, 158 deletions
diff --git a/Source/BoundaryConditions/PML_current.H b/Source/BoundaryConditions/PML_current.H index 92c2f3cd6..9687282e3 100644 --- a/Source/BoundaryConditions/PML_current.H +++ b/Source/BoundaryConditions/PML_current.H @@ -34,10 +34,7 @@ void push_ex_pml_current (int j, int k, int l, Ex(j,k,l,1) = Ex(j,k,l,1) - mu_c2_dt * alpha_xz * jx(j,k,l); #else Ex(j,k,l,1) = Ex(j,k,l,1) - mu_c2_dt * jx(j,k,l); - amrex::ignore_unused(sigjy); - amrex::ignore_unused(sigjz); - amrex::ignore_unused(ylo); - amrex::ignore_unused(zlo); + amrex::ignore_unused(sigjy, sigjz, ylo, zlo); #endif } @@ -65,10 +62,7 @@ void push_ey_pml_current (int j, int k, int l, #else Ey(j,k,l,0) = Ey(j,k,l,0) - 0.5 * mu_c2_dt * jy(j,k,l); Ey(j,k,l,1) = Ey(j,k,l,1) - 0.5 * mu_c2_dt * jy(j,k,l); - amrex::ignore_unused(sigjx); - amrex::ignore_unused(sigjz); - amrex::ignore_unused(xlo); - amrex::ignore_unused(zlo); + amrex::ignore_unused(sigjx, sigjz, xlo, zlo); #endif } @@ -95,10 +89,7 @@ void push_ez_pml_current (int j, int k, int l, Ez(j,k,l,1) = Ez(j,k,l,1) - mu_c2_dt * alpha_zy * jz(j,k,l); #else Ez(j,k,l,0) = Ez(j,k,l,0) - mu_c2_dt * jz(j,k,l); - amrex::ignore_unused(sigjx); - amrex::ignore_unused(sigjy); - amrex::ignore_unused(xlo); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigjx, sigjy, xlo, ylo); #endif } @@ -114,8 +105,7 @@ void damp_jx_pml (int j, int k, int l, jx(j,k,l) = jx(j,k,l) * sigsjx[j-xlo] * sigjy[k-ylo] * sigjz[l-zlo]; #else jx(j,k,l) = jx(j,k,l) * sigsjx[j-xlo] * sigjz[k-zlo]; - amrex::ignore_unused(xlo); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigjy, ylo); #endif } @@ -131,8 +121,7 @@ void damp_jy_pml (int j, int k, int l, jy(j,k,l) = jy(j,k,l) * sigjx[j-xlo] * sigsjy[k-ylo] * sigjz[l-zlo]; #else jy(j,k,l) = jy(j,k,l) * sigjx[j-xlo] * sigjz[k-zlo]; - amrex::ignore_unused(sigsjy); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigsjy, ylo); #endif } @@ -148,8 +137,7 @@ void damp_jz_pml (int j, int k, int l, jz(j,k,l) = jz(j,k,l) * sigjx[j-xlo] * sigjy[k-ylo] * sigsjz[l-zlo]; #else jz(j,k,l) = jz(j,k,l) * sigjx[j-xlo] * sigsjz[k-zlo]; - amrex::ignore_unused(sigjy); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigjy, ylo); #endif } diff --git a/Source/BoundaryConditions/WarpX_PML_kernels.H b/Source/BoundaryConditions/WarpX_PML_kernels.H index 330ac05c4..e91175322 100644 --- a/Source/BoundaryConditions/WarpX_PML_kernels.H +++ b/Source/BoundaryConditions/WarpX_PML_kernels.H @@ -25,8 +25,7 @@ void warpx_damp_pml_ex (int i, int j, int k, Array4<Real> const& Ex, Ex(i,j,k,1) *= sigma_fac_z[k-zlo]; #else Ex(i,j,k,1) *= sigma_fac_z[j-zlo]; - amrex::ignore_unused(sigma_fac_y); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigma_fac_y, ylo); #endif Ex(i,j,k,2) *= sigma_star_fac_x[i-xlo]; } @@ -43,8 +42,7 @@ void warpx_damp_pml_ey (int i, int j, int k, Array4<Real> const& Ey, Ey(i,j,k,2) *= sigma_star_fac_y[j-ylo]; #else Ey(i,j,k,0) *= sigma_fac_z[j-zlo]; - amrex::ignore_unused(sigma_star_fac_y); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigma_star_fac_y, ylo); #endif Ey(i,j,k,1) *= sigma_fac_x[i-xlo]; } @@ -62,8 +60,7 @@ void warpx_damp_pml_ez (int i, int j, int k, Array4<Real> const& Ez, Ez(i,j,k,2) *= sigma_star_fac_z[k-zlo]; #else Ez(i,j,k,2) *= sigma_star_fac_z[j-zlo]; - amrex::ignore_unused(sigma_fac_y); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigma_fac_y, ylo); #endif } @@ -79,8 +76,7 @@ void warpx_damp_pml_bx (int i, int j, int k, Array4<Real> const& Bx, Bx(i,j,k,1) *= sigma_star_fac_z[k-zlo]; #else Bx(i,j,k,1) *= sigma_star_fac_z[j-zlo]; - amrex::ignore_unused(sigma_star_fac_y); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigma_star_fac_y, ylo); #endif } @@ -108,8 +104,7 @@ void warpx_damp_pml_bz (int i, int j, int k, Array4<Real> const& Bz, #if (AMREX_SPACEDIM == 3) Bz(i,j,k,1) *= sigma_star_fac_y[j-ylo]; #else - amrex::ignore_unused(sigma_star_fac_y); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigma_star_fac_y, ylo); #endif } @@ -126,8 +121,7 @@ void warpx_damp_pml_F (int i, int j, int k, Array4<Real> const& F_fab, F_fab(i,j,k,2) *= sigma_fac_z[k-zlo]; #else F_fab(i,j,k,2) *= sigma_fac_z[j-zlo]; - amrex::ignore_unused(sigma_fac_y); - amrex::ignore_unused(ylo); + amrex::ignore_unused(sigma_fac_y, ylo); #endif } diff --git a/Source/Diagnostics/BTDiagnostics.cpp b/Source/Diagnostics/BTDiagnostics.cpp index 966d1ea48..d57af3ec0 100644 --- a/Source/Diagnostics/BTDiagnostics.cpp +++ b/Source/Diagnostics/BTDiagnostics.cpp @@ -160,7 +160,7 @@ BTDiagnostics::DoDump (int step, int i_buffer, bool force_flush) bool -BTDiagnostics::DoComputeAndPack (int step, bool force_flush) +BTDiagnostics::DoComputeAndPack (int step, bool /*force_flush*/) { // always set to true for BTDiagnostics since back-transform buffers are potentially // computed and packed every timstep, except at initialization when step == -1. @@ -286,7 +286,6 @@ BTDiagnostics::InitializeFieldBufferData ( int i_buffer , int lev) int Ny_lab = std::max( 0, num_ycells_lab ); m_buffer_ncells_lab[i_buffer] = {Nx_lab, Ny_lab, Nz_lab}; #else - int Ny_lab = 0; m_buffer_ncells_lab[i_buffer] = {Nx_lab, Nz_lab}; #endif // Call funtion to create directories for customized output format @@ -421,8 +420,6 @@ BTDiagnostics::PrepareFieldDataForOutput () { for (int i_buffer = 0; i_buffer < m_num_buffers; ++i_buffer ) { - // Current z-boost is stored as old z-boost position before updating - const amrex::Real old_z_boost = m_current_z_boost[i_buffer]; // Update z-boost and z-lab positions m_current_z_boost[i_buffer] = UpdateCurrentZBoostCoordinate(m_t_lab[i_buffer], warpx.gett_new(lev) ); @@ -472,7 +469,6 @@ BTDiagnostics::k_index_zlab (int i_buffer, int lev) void BTDiagnostics::DefineFieldBufferMultiFab (const int i_buffer, const int lev) { - auto & warpx = WarpX::GetInstance(); if ( m_do_back_transformed_fields ) { const int k_lab = k_index_zlab (i_buffer, lev); diff --git a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp index ed866e666..bab89c195 100644 --- a/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp +++ b/Source/Diagnostics/ComputeDiagFunctors/BackTransformFunctor.cpp @@ -14,7 +14,7 @@ BackTransformFunctor::BackTransformFunctor (amrex::MultiFab const * mf_src, int } void -BackTransformFunctor::operator ()(amrex::MultiFab& mf_dst, int dcomp, const int i_buffer) const +BackTransformFunctor::operator ()(amrex::MultiFab& mf_dst, int /*dcomp*/, const int i_buffer) const { // Perform back-transformation only if z slice is within the domain stored as 0/1 // in m_perform_backtransform[i_buffer] @@ -190,4 +190,3 @@ BackTransformFunctor::LorentzTransformZ (amrex::MultiFab& data, amrex::Real gamm } } - diff --git a/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H index bfd264231..f1f2d587c 100644 --- a/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H +++ b/Source/Diagnostics/ComputeDiagFunctors/ComputeDiagFunctor.H @@ -1,6 +1,7 @@ #ifndef WARPX_COMPUTEDIAGFUNCTOR_H_ #define WARPX_COMPUTEDIAGFUNCTOR_H_ +#include <AMReX.H> #include <AMReX_MultiFab.H> /** @@ -27,10 +28,15 @@ public: * multifab */ int nComp () const { return m_ncomp; } - virtual void PrepareFunctorData ( int /* i_buffer */, bool /* ZSliceInDomain */, - amrex::Real /* current_z_boost */, - amrex::Box /* buffer_box */, const int /* k_index_zlab */) {}; - virtual void InitData() {}; + virtual void PrepareFunctorData ( int i_buffer, bool ZSliceInDomain, + amrex::Real current_z_boost, + amrex::Box buffer_box, const int k_index_zlab) { + amrex::ignore_unused(i_buffer, + ZSliceInDomain, + current_z_boost, buffer_box, + k_index_zlab); + } + virtual void InitData() {} private: /** Number of components of mf_dst that this functor updates. */ int m_ncomp; diff --git a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp index 82146aeee..3eb859903 100644 --- a/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp +++ b/Source/Diagnostics/ComputeDiagFunctors/DivEFunctor.cpp @@ -1,12 +1,16 @@ #include "DivEFunctor.H" #include "Utils/CoarsenIO.H" +#include <AMReX.H> + DivEFunctor::DivEFunctor(const std::array<const amrex::MultiFab* const, 3> arr_mf_src, const int lev, const amrex::IntVect crse_ratio, bool convertRZmodes2cartesian, const int ncomp) : ComputeDiagFunctor(ncomp, crse_ratio), m_arr_mf_src(arr_mf_src), m_lev(lev), m_convertRZmodes2cartesian(convertRZmodes2cartesian) -{} +{ + amrex::ignore_unused(m_arr_mf_src); +} void DivEFunctor::operator()(amrex::MultiFab& mf_dst, const int dcomp, const int /*i_buffer*/) const @@ -45,5 +49,6 @@ DivEFunctor::operator()(amrex::MultiFab& mf_dst, const int dcomp, const int /*i_ // In cartesian geometry, coarsen and interpolate from simulation MultiFab, divE, // to output diagnostic MultiFab, mf_dst. CoarsenIO::Coarsen( mf_dst, divE, dcomp, 0, nComp(), 0, m_crse_ratio); + amrex::ignore_unused(m_convertRZmodes2cartesian); #endif } diff --git a/Source/Diagnostics/FieldIO.cpp b/Source/Diagnostics/FieldIO.cpp index f20b756fa..10195eb99 100644 --- a/Source/Diagnostics/FieldIO.cpp +++ b/Source/Diagnostics/FieldIO.cpp @@ -18,6 +18,8 @@ # include <openPMD/openPMD.hpp> #endif +#include <AMReX.H> + using namespace amrex; /** \brief @@ -160,6 +162,7 @@ AverageAndPackScalarField (MultiFab& mf_avg, scalar_total = new MultiFab(scalar_field, amrex::make_alias, 0, 1); } #else + amrex::ignore_unused(dm); const MultiFab *scalar_total = &scalar_field; #endif diff --git a/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp b/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp index b0903b5a4..e14199b02 100644 --- a/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp +++ b/Source/Diagnostics/FlushFormats/FlushFormatAscent.cpp @@ -1,6 +1,8 @@ #include "FlushFormatAscent.H" #include "WarpX.H" +#include <AMReX.H> + using namespace amrex; void @@ -11,7 +13,7 @@ FlushFormatAscent::WriteToFile ( const amrex::Vector<int> iteration, const double time, const amrex::Vector<ParticleDiag>& particle_diags, int nlev, const std::string prefix, bool plot_raw_fields, - bool plot_raw_fields_guards, bool plot_raw_rho, bool plot_raw_F) const + bool plot_raw_fields_guards, bool /*plot_raw_rho*/, bool plot_raw_F) const { #ifdef AMREX_USE_ASCENT @@ -39,6 +41,10 @@ FlushFormatAscent::WriteToFile ( ascent.execute(actions); ascent.close(); +#else + amrex::ignore_unused(varnames, mf, geom, iteration, time, + particle_diags, nlev, prefix, plot_raw_fields, + plot_raw_fields_guards, plot_raw_F); #endif // AMREX_USE_ASCENT } diff --git a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp index d0bc9292c..0afded6f1 100644 --- a/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp +++ b/Source/Diagnostics/FlushFormats/FlushFormatCheckpoint.cpp @@ -13,14 +13,14 @@ namespace void FlushFormatCheckpoint::WriteToFile ( - const amrex::Vector<std::string> varnames, - const amrex::Vector<amrex::MultiFab>& mf, - amrex::Vector<amrex::Geometry>& geom, - const amrex::Vector<int> iteration, const double time, + const amrex::Vector<std::string> /*varnames*/, + const amrex::Vector<amrex::MultiFab>& /*mf*/, + amrex::Vector<amrex::Geometry>& /*geom*/, + const amrex::Vector<int> iteration, const double /*time*/, const amrex::Vector<ParticleDiag>& particle_diags, int nlev, const std::string prefix, - bool plot_raw_fields, - bool plot_raw_fields_guards, - bool plot_raw_rho, bool plot_raw_F) const + bool /*plot_raw_fields*/, + bool /*plot_raw_fields_guards*/, + bool /*plot_raw_rho*/, bool /*plot_raw_F*/) const { WARPX_PROFILE("FlushFormatCheckpoint::WriteToFile()"); diff --git a/Source/Diagnostics/FlushFormats/FlushFormatSensei.H b/Source/Diagnostics/FlushFormats/FlushFormatSensei.H index 1cf652e63..eed95371e 100644 --- a/Source/Diagnostics/FlushFormats/FlushFormatSensei.H +++ b/Source/Diagnostics/FlushFormats/FlushFormatSensei.H @@ -61,10 +61,10 @@ public: void WriteParticles(const amrex::Vector<ParticleDiag>& particle_diags) const; private: - amrex::AmrMesh * m_amr_mesh; - amrex::AmrMeshInSituBridge * m_insitu_bridge; std::string m_insitu_config; - int m_insitu_pin_mesh; + int m_insitu_pin_mesh = 0; + amrex::AmrMeshInSituBridge * m_insitu_bridge = nullptr; + amrex::AmrMesh * m_amr_mesh = nullptr; }; #endif // WARPX_FLUSHFORMATSENSEI_H_ diff --git a/Source/Diagnostics/FullDiagnostics.cpp b/Source/Diagnostics/FullDiagnostics.cpp index 140febc6f..6ec13ed97 100644 --- a/Source/Diagnostics/FullDiagnostics.cpp +++ b/Source/Diagnostics/FullDiagnostics.cpp @@ -231,8 +231,7 @@ FullDiagnostics::AddRZModesToOutputNames (const std::string& field, int ncomp){ m_varnames.push_back( field + "_" + std::to_string(ic) + "_imag" ); } #else - amrex::ignore_unused(field); - amrex::ignore_unused(ncomp); + amrex::ignore_unused(field, ncomp); #endif } diff --git a/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp b/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp index 809f6e6bd..b194ca9ff 100644 --- a/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp +++ b/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp @@ -167,7 +167,9 @@ void BeamRelevant::ComputeDiags (int step) if (w_sum < std::numeric_limits<Real>::min() ) { - for (int i = 0; i < m_data.size(); ++i) { m_data[i] = 0.0; } + for (int i = 0; i < static_cast<int>(m_data.size()); ++i){ + m_data[i] = 0.0; + } return; } diff --git a/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp b/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp index cefd55c85..c70711d66 100644 --- a/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp +++ b/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp @@ -99,7 +99,6 @@ void FieldEnergy::ComputeDiags (int step) // get cell size Geometry const & geom = warpx.Geom(lev); - auto domain_box = geom.Domain(); #if (AMREX_SPACEDIM == 2) auto dV = geom.CellSize(0) * geom.CellSize(1); #elif (AMREX_SPACEDIM == 3) diff --git a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp index 7c26f2b26..40e2a0581 100644 --- a/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp +++ b/Source/Diagnostics/ReducedDiags/LoadBalanceCosts.cpp @@ -197,7 +197,7 @@ void LoadBalanceCosts::WriteToFile (int step) const ofs << WarpX::GetInstance().gett_new(0); // loop over data size and write - for (int i = 0; i < m_data.size(); ++i) + for (int i = 0; i < static_cast<int>(m_data.size()); ++i) { ofs << m_sep << m_data[i]; if ((i - m_nDataFields + 1)%m_nDataFields == 0) diff --git a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp index fe4ac71ea..bc8a8fb9a 100644 --- a/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp +++ b/Source/Diagnostics/ReducedDiags/MultiReducedDiags.cpp @@ -34,7 +34,7 @@ MultiReducedDiags::MultiReducedDiags () m_multi_rd.resize(m_rd_names.size()); // loop over all reduced diags - for (int i_rd = 0; i_rd < m_rd_names.size(); ++i_rd) + for (int i_rd = 0; i_rd < static_cast<int>(m_rd_names.size()); ++i_rd) { ParmParse pp_rd(m_rd_names[i_rd]); @@ -83,7 +83,7 @@ MultiReducedDiags::MultiReducedDiags () void MultiReducedDiags::ComputeDiags (int step) { // loop over all reduced diags - for (int i_rd = 0; i_rd < m_rd_names.size(); ++i_rd) + for (int i_rd = 0; i_rd < static_cast<int>(m_rd_names.size()); ++i_rd) { m_multi_rd[i_rd] -> ComputeDiags(step); } @@ -99,7 +99,7 @@ void MultiReducedDiags::WriteToFile (int step) if ( !ParallelDescriptor::IOProcessor() ) { return; } // loop over all reduced diags - for (int i_rd = 0; i_rd < m_rd_names.size(); ++i_rd) + for (int i_rd = 0; i_rd < static_cast<int>(m_rd_names.size()); ++i_rd) { // Judge if the diags should be done diff --git a/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp b/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp index cb9448870..afc44dd74 100644 --- a/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp +++ b/Source/Diagnostics/ReducedDiags/ReducedDiags.cpp @@ -77,7 +77,7 @@ void ReducedDiags::WriteToFile (int step) const ofs << WarpX::GetInstance().gett_new(0); // loop over data size and write - for (int i = 0; i < m_data.size(); ++i) + for (int i = 0; i < static_cast<int>(m_data.size()); ++i) { ofs << m_sep; ofs << m_data[i]; 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 } diff --git a/Source/Filter/NCIGodfreyFilter.cpp b/Source/Filter/NCIGodfreyFilter.cpp index 8f4f14fb2..a4797dae3 100644 --- a/Source/Filter/NCIGodfreyFilter.cpp +++ b/Source/Filter/NCIGodfreyFilter.cpp @@ -33,14 +33,13 @@ NCIGodfreyFilter::NCIGodfreyFilter(godfrey_coeff_set coeff_set, amrex::Real cdto void NCIGodfreyFilter::ComputeStencils(){ // Sanity checks: filter length shoulz be 5 in z +#if (AMREX_SPACEDIM == 3) AMREX_ALWAYS_ASSERT_WITH_MESSAGE( -#if ( AMREX_SPACEDIM == 3 ) - slen.z==5, + slen.z==5,"ERROR: NCI filter requires 5 points in z"); #else - slen.y==5, + AMREX_ALWAYS_ASSERT_WITH_MESSAGE( + slen.y==5,"ERROR: NCI filter requires 5 points in z"); #endif - "ERROR: NCI filter requires 5 points in z"); - // Interpolate coefficients from the table, and store into prestencil. auto index = static_cast<int>(tab_length*m_cdtodz); index = min(index, tab_length-2); diff --git a/Source/Laser/LaserParticleContainer.cpp b/Source/Laser/LaserParticleContainer.cpp index c80f64d2e..e7b39905b 100644 --- a/Source/Laser/LaserParticleContainer.cpp +++ b/Source/Laser/LaserParticleContainer.cpp @@ -12,12 +12,13 @@ #include "Particles/MultiParticleContainer.H" #include "Particles/Pusher/GetAndSetPosition.H" +#include <AMReX.H> + #include <limits> #include <cmath> #include <algorithm> #include <numeric> - using namespace amrex; using namespace WarpXLaserProfiles; @@ -234,6 +235,7 @@ LaserParticleContainer::InitData (int lev) position[1] + (S_X*(Real(i)+0.5_rt))*u_X[1] + (S_Y*(Real(j)+0.5_rt))*u_Y[1], position[2] + (S_X*(Real(i)+0.5_rt))*u_X[2] + (S_Y*(Real(j)+0.5_rt))*u_Y[2] }; #else + amrex::ignore_unused(j); # if (defined WARPX_DIM_RZ) return { position[0] + (S_X*(Real(i)+0.5_rt)), 0.0_rt, @@ -568,7 +570,7 @@ LaserParticleContainer::ComputeWeightMobility (Real Sx, Real Sy) } void -LaserParticleContainer::PushP (int lev, Real dt, +LaserParticleContainer::PushP (int /*lev*/, Real /*dt*/, const MultiFab&, const MultiFab&, const MultiFab&, const MultiFab&, const MultiFab&, const MultiFab&) { diff --git a/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp b/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp index e4be9e907..f6def86b0 100644 --- a/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp +++ b/Source/Laser/LaserProfilesImpl/LaserProfileFromTXYEFile.cpp @@ -11,6 +11,7 @@ #include <AMReX_Print.H> #include <AMReX_ParallelDescriptor.H> +#include <AMReX.H> #include <limits> #include <iostream> @@ -254,7 +255,7 @@ WarpXLaserProfiles::FromTXYEFileLaserProfile::read_data_t_chuck(int t_begin, int //Indices of the first and last timestep to read auto i_first = max(0, t_begin); auto i_last = min(t_end-1, m_params.nt-1); - if(i_last-i_first+1 > m_params.E_data.size()) + if(i_last-i_first+1 > static_cast<int>(m_params.E_data.size())) Abort("Data chunk to read from file is too large"); if(ParallelDescriptor::IOProcessor()){ @@ -357,6 +358,7 @@ WarpXLaserProfiles::FromTXYEFileLaserProfile::internal_fill_amplitude_uniform( p_E_data[idx(idx_t_right, idx_x_left)], p_E_data[idx(idx_t_right, idx_x_right)], t, Xp[i])*tmp_e_max; + amrex::ignore_unused(Yp); #elif (AMREX_SPACEDIM == 3) //Find indices and coordinates along y diff --git a/Source/Parallelization/GuardCellManager.cpp b/Source/Parallelization/GuardCellManager.cpp index a4a3e78e2..05ea700d8 100644 --- a/Source/Parallelization/GuardCellManager.cpp +++ b/Source/Parallelization/GuardCellManager.cpp @@ -8,6 +8,7 @@ #include "Filter/NCIGodfreyFilter.H" #include <AMReX_Print.H> #include <AMReX_ParmParse.H> +#include <AMReX.H> using namespace amrex; @@ -111,10 +112,10 @@ guardCellManager::Init( pp.query("ny_guard", ngFFt_y); pp.query("nz_guard", ngFFt_z); -#if (AMREX_SPACEDIM == 3) - IntVect ngFFT = IntVect(ngFFt_x, ngFFt_y, ngFFt_z); +#if (AMREX_SPACEDIM == 3) + IntVect ngFFT = IntVect(ngFFt_x, ngFFt_y, ngFFt_z); #elif (AMREX_SPACEDIM == 2) - IntVect ngFFT = IntVect(ngFFt_x, ngFFt_z); + IntVect ngFFT = IntVect(ngFFt_x, ngFFt_z); #endif for (int i_dim=0; i_dim<AMREX_SPACEDIM; i_dim++ ){ @@ -132,6 +133,8 @@ guardCellManager::Init( ng_alloc_F_int = ng_required; } ng_alloc_F = IntVect(AMREX_D_DECL(ng_alloc_F_int, ng_alloc_F_int, ng_alloc_F_int)); +#else + ignore_unused(nox_fft, noy_fft, noz_fft); #endif ng_Extra = IntVect(static_cast<int>(aux_is_nodal and !do_nodal)); diff --git a/Source/Parallelization/WarpXComm_K.H b/Source/Parallelization/WarpXComm_K.H index 1b6eceb93..b490636ee 100644 --- a/Source/Parallelization/WarpXComm_K.H +++ b/Source/Parallelization/WarpXComm_K.H @@ -8,6 +8,7 @@ #define WARPX_COMM_K_H_ #include <AMReX_FArrayBox.H> +#include <AMReX.H> AMREX_GPU_DEVICE AMREX_FORCE_INLINE void warpx_interp_bfield_x (int j, int k, int l, @@ -384,6 +385,7 @@ void warpx_interp_nd_bfield_x (int j, int k, int l, { #if (AMREX_SPACEDIM == 2) Bxa(j,k,0) = 0.5*(Bxf(j,k-1,0) + Bxf(j,k,0)); + amrex::ignore_unused(l); #else Bxa(j,k,l) = 0.25*(Bxf(j,k-1,l-1) + Bxf(j,k,l-1) + Bxf(j,k-1,l) + Bxf(j,k,l)); #endif @@ -396,6 +398,7 @@ void warpx_interp_nd_bfield_y (int j, int k, int l, { #if (AMREX_SPACEDIM == 2) Bya(j,k,0) = 0.25*(Byf(j,k,0) + Byf(j-1,k,0) + Byf(j,k-1,0) + Byf(j-1,k-1,0)); + amrex::ignore_unused(l); #else Bya(j,k,l) = 0.25*(Byf(j-1,k,l-1) + Byf(j,k,l-1) + Byf(j-1,k,l) + Byf(j,k,l)); #endif @@ -408,6 +411,7 @@ void warpx_interp_nd_bfield_z (int j, int k, int l, { #if (AMREX_SPACEDIM == 2) Bza(j,k,0) = 0.5*(Bzf(j-1,k,0) + Bzf(j,k,0)); + amrex::ignore_unused(l); #else Bza(j,k,l) = 0.25*(Bzf(j-1,k-1,l) + Bzf(j,k-1,l) + Bzf(j-1,k,l) + Bzf(j,k,l)); #endif @@ -632,6 +636,7 @@ void warpx_interp_nd_efield_y (int j, int k, int l, { #if (AMREX_SPACEDIM == 2) Eya(j,k,0) = Eyf(j,k,0); + amrex::ignore_unused(l); #else Eya(j,k,l) = 0.5*(Eyf(j,k-1,l) + Eyf(j,k,l)); #endif @@ -644,6 +649,7 @@ void warpx_interp_nd_efield_z (int j, int k, int l, { #if (AMREX_SPACEDIM == 2) Eza(j,k,0) = 0.5*(Ezf(j,k-1,0) + Ezf(j,k,0)); + amrex::ignore_unused(l); #else Eza(j,k,l) = 0.5*(Ezf(j,k,l-1) + Ezf(j,k,l)); #endif diff --git a/Source/Parallelization/WarpXRegrid.cpp b/Source/Parallelization/WarpXRegrid.cpp index 6c6710121..9381bf60d 100644 --- a/Source/Parallelization/WarpXRegrid.cpp +++ b/Source/Parallelization/WarpXRegrid.cpp @@ -58,8 +58,8 @@ WarpX::LoadBalance () // As specified in the above calls to makeSFC and makeKnapSack, the new // distribution mapping is NOT communicated to all ranks; the loadbalanced // dm is up-to-date only on root, and we can decide whether to broadcast - if (load_balance_efficiency_ratio_threshold > 0.0 - & ParallelDescriptor::MyProc() == ParallelDescriptor::IOProcessorNumber()) + if ((load_balance_efficiency_ratio_threshold > 0.0) + && (ParallelDescriptor::MyProc() == ParallelDescriptor::IOProcessorNumber())) { doLoadBalance = (proposedEfficiency > load_balance_efficiency_ratio_threshold*currentEfficiency); } diff --git a/Source/Parser/WarpXParser.cpp b/Source/Parser/WarpXParser.cpp index 093d7b2d6..38350ab3c 100644 --- a/Source/Parser/WarpXParser.cpp +++ b/Source/Parser/WarpXParser.cpp @@ -100,7 +100,7 @@ WarpXParser::registerVariables (std::vector<std::string> const& names) const int tid = omp_get_thread_num(); struct wp_parser* p = m_parser[tid]; auto& v = m_variables[tid]; - for (int j = 0; j < names.size(); ++j) { + for (int j = 0; j < static_cast<int>(names.size()); ++j) { wp_parser_regvar(p, names[j].c_str(), &(v[j])); m_varnames[tid].push_back(names[j]); } diff --git a/Source/Particles/Collision/CollisionType.cpp b/Source/Particles/Collision/CollisionType.cpp index d9de0ec1d..8c5fac875 100644 --- a/Source/Particles/Collision/CollisionType.cpp +++ b/Source/Particles/Collision/CollisionType.cpp @@ -25,7 +25,7 @@ CollisionType::CollisionType( m_CoulombLog = -1.0; pp.query("CoulombLog", m_CoulombLog); - for (int i=0; i<species_names.size(); i++) + for (int i=0; i<static_cast<int>(species_names.size()); i++) { if (species_names[i] == collision_species[0]) { m_species1_index = i; } @@ -162,6 +162,8 @@ void CollisionType::doCoulombCollisionsWithinTile #if defined WARPX_DIM_RZ int ri = (i_cell - i_cell%nz) / nz; auto dV = MathConst::pi*(2.0*ri+1.0)*dr*dr*dz; +#else + amrex::ignore_unused(nz); #endif // Call the function in order to perform collisions @@ -257,6 +259,8 @@ void CollisionType::doCoulombCollisionsWithinTile #if defined WARPX_DIM_RZ int ri = (i_cell - i_cell%nz) / nz; auto dV = MathConst::pi*(2.0*ri+1.0)*dr*dr*dz; +#else + amrex::ignore_unused(nz); #endif // Call the function in order to perform collisions diff --git a/Source/Particles/Collision/ComputeTemperature.H b/Source/Particles/Collision/ComputeTemperature.H index 8128e40ec..50e1f4a4b 100644 --- a/Source/Particles/Collision/ComputeTemperature.H +++ b/Source/Particles/Collision/ComputeTemperature.H @@ -26,7 +26,7 @@ T_R ComputeTemperature ( T_R vz = T_R(0.0); T_R vs = T_R(0.0); T_R gm = T_R(0.0); T_R us = T_R(0.0); - for (int i = Is; i < Ie; ++i) + for (int i = Is; i < static_cast<int>(Ie); ++i) { us = ( ux[ I[i] ] * ux[ I[i] ] + uy[ I[i] ] * uy[ I[i] ] + diff --git a/Source/Particles/Collision/ElasticCollisionPerez.H b/Source/Particles/Collision/ElasticCollisionPerez.H index e98a76a92..8262a19ce 100644 --- a/Source/Particles/Collision/ElasticCollisionPerez.H +++ b/Source/Particles/Collision/ElasticCollisionPerez.H @@ -69,16 +69,16 @@ void ElasticCollisionPerez ( T_R n1 = T_R(0.0); T_R n2 = T_R(0.0); T_R n12 = T_R(0.0); - for (int i1=I1s; i1<I1e; ++i1) { n1 += w1[ I1[i1] ]; } - for (int i2=I2s; i2<I2e; ++i2) { n2 += w2[ I2[i2] ]; } + for (int i1=I1s; i1<static_cast<int>(I1e); ++i1) { n1 += w1[ I1[i1] ]; } + for (int i2=I2s; i2<static_cast<int>(I2e); ++i2) { n2 += w2[ I2[i2] ]; } n1 = n1 / dV; n2 = n2 / dV; { int i1 = I1s; int i2 = I2s; for (int k = 0; k < amrex::max(NI1,NI2); ++k) { n12 += amrex::min( w1[ I1[i1] ], w2[ I2[i2] ] ); - ++i1; if ( i1 == I1e ) { i1 = I1s; } - ++i2; if ( i2 == I2e ) { i2 = I2s; } + ++i1; if ( i1 == static_cast<int>(I1e) ) { i1 = I1s; } + ++i2; if ( i2 == static_cast<int>(I2e) ) { i2 = I2s; } } n12 = n12 / dV; } @@ -102,8 +102,8 @@ void ElasticCollisionPerez ( n1, n2, n12, q1, m1, w1[ I1[i1] ], q2, m2, w2[ I2[i2] ], dt, L, lmdD); - ++i1; if ( i1 == I1e ) { i1 = I1s; } - ++i2; if ( i2 == I2e ) { i2 = I2s; } + ++i1; if ( i1 == static_cast<int>(I1e) ) { i1 = I1s; } + ++i2; if ( i2 == static_cast<int>(I2e) ) { i2 = I2s; } } } diff --git a/Source/Particles/Collision/ShuffleFisherYates.H b/Source/Particles/Collision/ShuffleFisherYates.H index 614b44d37..a2a7879b9 100644 --- a/Source/Particles/Collision/ShuffleFisherYates.H +++ b/Source/Particles/Collision/ShuffleFisherYates.H @@ -21,7 +21,7 @@ void ShuffleFisherYates (T_index *array, T_index const is, T_index const ie) { int j; T_index buf; - for (int i = ie-1; i >= is+1; --i) + for (int i = ie-1; i >= static_cast<int>(is+1); --i) { // get random number j: is <= j <= i j = amrex::Random_int(i-is+1) + is; diff --git a/Source/Particles/ElementaryProcess/Ionization.H b/Source/Particles/ElementaryProcess/Ionization.H index f2f8dc6b0..162915604 100644 --- a/Source/Particles/ElementaryProcess/Ionization.H +++ b/Source/Particles/ElementaryProcess/Ionization.H @@ -129,7 +129,7 @@ struct IonizationTransformFunc { template <typename DstData, typename SrcData> AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - void operator() (DstData& dst, SrcData& src, int i_src, int i_dst) const noexcept + void operator() (DstData& /*dst*/, SrcData& src, int i_src, int /*i_dst*/) const noexcept { src.m_runtime_idata[0][i_src] += 1; } diff --git a/Source/Particles/Filter/FilterFunctors.H b/Source/Particles/Filter/FilterFunctors.H index 44240f3fc..b4c104587 100644 --- a/Source/Particles/Filter/FilterFunctors.H +++ b/Source/Particles/Filter/FilterFunctors.H @@ -34,7 +34,7 @@ struct RandomFilter * \return whether or not the particle is selected */ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - bool operator () (const SuperParticleType& p) const noexcept + bool operator () (const SuperParticleType& /*p*/) const noexcept { if ( !m_is_active ) return 1; else if ( amrex::Random() < m_fraction ) return 1; diff --git a/Source/Particles/Gather/FieldGather.H b/Source/Particles/Gather/FieldGather.H index 49abe63b2..4f8f8ae28 100644 --- a/Source/Particles/Gather/FieldGather.H +++ b/Source/Particles/Gather/FieldGather.H @@ -102,10 +102,10 @@ void doGatherShapeN (const amrex::ParticleReal xp, amrex::Real sx_cell[depos_order + 1]; amrex::Real sx_node_v[depos_order + 1 - lower_in_v]; amrex::Real sx_cell_v[depos_order + 1 - lower_in_v]; - int j_node; - int j_cell; - int j_node_v; - int j_cell_v; + int j_node = 0; + int j_cell = 0; + int j_node_v = 0; + int j_cell_v = 0; Compute_shape_factor< depos_order > const compute_shape_factor; Compute_shape_factor< depos_order-lower_in_v > const compute_shape_factor_lower_in_v; if ((ey_type[0] == NODE) || (ez_type[0] == NODE) || (bx_type[0] == NODE)) { @@ -140,10 +140,10 @@ void doGatherShapeN (const amrex::ParticleReal xp, amrex::Real sy_cell[depos_order + 1]; amrex::Real sy_node_v[depos_order + 1 - lower_in_v]; amrex::Real sy_cell_v[depos_order + 1 - lower_in_v]; - int k_node; - int k_cell; - int k_node_v; - int k_cell_v; + int k_node = 0; + int k_cell = 0; + int k_node_v = 0; + int k_cell_v = 0; if ((ex_type[1] == NODE) || (ez_type[1] == NODE) || (by_type[1] == NODE)) { k_node = compute_shape_factor(sy_node, y); } @@ -176,10 +176,10 @@ void doGatherShapeN (const amrex::ParticleReal xp, amrex::Real sz_cell[depos_order + 1]; amrex::Real sz_node_v[depos_order + 1 - lower_in_v]; amrex::Real sz_cell_v[depos_order + 1 - lower_in_v]; - int l_node; - int l_cell; - int l_node_v; - int l_cell_v; + int l_node = 0; + int l_cell = 0; + int l_node_v = 0; + int l_cell_v = 0; if ((ex_type[zdir] == NODE) || (ey_type[zdir] == NODE) || (bz_type[zdir] == NODE)) { l_node = compute_shape_factor(sz_node, z); } diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index 6d68f8a13..b888bc430 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -33,8 +33,8 @@ MultiParticleContainer::MultiParticleContainer (AmrCore* amr_core) ReadParameters(); - auto const nspecies = species_names.size(); - auto const nlasers = lasers_names.size(); + auto const nspecies = static_cast<int>(species_names.size()); + auto const nlasers = static_cast<int>(lasers_names.size()); allcontainers.resize(nspecies + nlasers); for (int i = 0; i < nspecies; ++i) { diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 04e7c75d8..efce2245d 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -707,7 +707,7 @@ PhysicalParticleContainer::AddPlasma (int lev, RealBox part_realbox) pa[ia] = soa.GetRealData(ia).data() + old_size; } - int* pi; + int* pi = nullptr; if (do_field_ionization) { pi = soa.GetIntData(particle_icomps["ionization_level"]).data() + old_size; } diff --git a/Source/Particles/Pusher/UpdatePositionPhoton.H b/Source/Particles/Pusher/UpdatePositionPhoton.H index 08827e407..4787c67c0 100644 --- a/Source/Particles/Pusher/UpdatePositionPhoton.H +++ b/Source/Particles/Pusher/UpdatePositionPhoton.H @@ -12,7 +12,7 @@ #include <AMReX_FArrayBox.H> #include <AMReX_REAL.H> - +#include <AMReX.H> /** * \brief Push the position of a photon particle over one timestep, @@ -31,6 +31,8 @@ void UpdatePositionPhoton( x += ux * c_over_umod * dt; #if (defined WARPX_DIM_3D) || (defined WARPX_DIM_RZ) // RZ pushes particles in 3D y += uy * c_over_umod * dt; +#else + amrex::ignore_unused(y); #endif z += uz * c_over_umod * dt; } diff --git a/Source/Particles/ShapeFactors.H b/Source/Particles/ShapeFactors.H index 917f0872d..835d1237e 100644 --- a/Source/Particles/ShapeFactors.H +++ b/Source/Particles/ShapeFactors.H @@ -23,7 +23,7 @@ struct Compute_shape_factor { template< typename T > AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE - int operator()(T* const sx, T xint) const { return 0; } + int operator()(T* const /*sx*/, T /*xint*/) const { return 0; } }; /** diff --git a/Source/Utils/Interpolate.cpp b/Source/Utils/Interpolate.cpp index b5d713b75..11d6989a0 100644 --- a/Source/Utils/Interpolate.cpp +++ b/Source/Utils/Interpolate.cpp @@ -56,7 +56,7 @@ namespace Interpolate const MultiFab* Fy_fp, const MultiFab* Fz_fp, const DistributionMapping& dm, const int r_ratio, - const Real* dx, const int ngrow ) + const Real* /*dx*/, const int ngrow ) { // Prepare the structure that will contain the returned fields diff --git a/Source/Utils/IntervalsParser.cpp b/Source/Utils/IntervalsParser.cpp index 657911524..77e3fa221 100644 --- a/Source/Utils/IntervalsParser.cpp +++ b/Source/Utils/IntervalsParser.cpp @@ -62,7 +62,7 @@ IntervalsParser::IntervalsParser (const std::string& instr) { auto insplit = WarpXUtilStr::split<std::vector<std::string>>(instr, m_separator); - for(int i=0; i<insplit.size(); i++) + for(int i=0; i<static_cast<int>(insplit.size()); i++) { SliceParser temp_slice(insplit[i]); m_slices.push_back(temp_slice); @@ -73,7 +73,7 @@ IntervalsParser::IntervalsParser (const std::string& instr) bool IntervalsParser::contains (const int n) const { - for(int i=0; i<m_slices.size(); i++){ + for(int i=0; i<static_cast<int>(m_slices.size()); i++){ if (m_slices[i].contains(n)) return true; } return false; @@ -82,7 +82,7 @@ bool IntervalsParser::contains (const int n) const int IntervalsParser::nextContains (const int n) const { int next = std::numeric_limits<int>::max(); - for(int i=0; i<m_slices.size(); i++){ + for(int i=0; i<static_cast<int>(m_slices.size()); i++){ next = std::min(m_slices[i].nextContains(n),next); } return next; @@ -91,7 +91,7 @@ int IntervalsParser::nextContains (const int n) const int IntervalsParser::previousContains (const int n) const { int previous = 0; - for(int i=0; i<m_slices.size(); i++){ + for(int i=0; i<static_cast<int>(m_slices.size()); i++){ previous = std::max(m_slices[i].previousContains(n),previous); } return previous; diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp index 8435864b8..e0f4daff1 100644 --- a/Source/Utils/WarpXMovingWindow.cpp +++ b/Source/Utils/WarpXMovingWindow.cpp @@ -112,8 +112,8 @@ WarpX::MoveWindow (bool move_j) // Shift each component of vector fields (E, B, j) for (int dim = 0; dim < 3; ++dim) { // Fine grid - ParserWrapper<3> *Bfield_parser; - ParserWrapper<3> *Efield_parser; + ParserWrapper<3> *Bfield_parser = nullptr; + ParserWrapper<3> *Efield_parser = nullptr; bool use_Bparser = false; bool use_Eparser = false; if (B_ext_grid_s == "parse_b_ext_grid_function") { diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp index 3b3d77bfd..55718a7cd 100644 --- a/Source/WarpX.cpp +++ b/Source/WarpX.cpp @@ -1010,10 +1010,10 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm if ( fft_periodic_single_box == false ) { realspace_ba.grow(ngE); // add guard cells } - bool const pml=false; + bool const pml_flag_false=false; spectral_solver_fp[lev].reset( new SpectralSolver( realspace_ba, dm, nox_fft, noy_fft, noz_fft, do_nodal, v_galilean, dx_vect, dt[lev], - pml, fft_periodic_single_box, update_with_rho, fft_do_time_averaging ) ); + pml_flag_false, fft_periodic_single_box, update_with_rho, fft_do_time_averaging ) ); # endif #endif m_fdtd_solver_fp[lev].reset( @@ -1117,21 +1117,21 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm RealVect cdx_vect(cdx[0], cdx[2]); # endif // Get the cell-centered box, with guard cells - BoxArray realspace_ba = cba;// Copy box - realspace_ba.enclosedCells(); // Make it cell-centered + BoxArray c_realspace_ba = cba;// Copy box + c_realspace_ba.enclosedCells(); // Make it cell-centered // Define spectral solver # ifdef WARPX_DIM_RZ - realspace_ba.grow(1, ngE[1]); // add guard cells only in z - spectral_solver_cp[lev].reset( new SpectralSolverRZ( realspace_ba, dm, + c_realspace_ba.grow(1, ngE[1]); // add guard cells only in z + spectral_solver_cp[lev].reset( new SpectralSolverRZ( c_realspace_ba, dm, n_rz_azimuthal_modes, noz_fft, do_nodal, cdx_vect, dt[lev], lev ) ); if (use_kspace_filter) { spectral_solver_cp[lev]->InitFilter(filter_npass_each_dir, use_filter_compensation); } # else - realspace_ba.grow(ngE); // add guard cells - spectral_solver_cp[lev].reset( new SpectralSolver( realspace_ba, dm, + c_realspace_ba.grow(ngE); // add guard cells + spectral_solver_cp[lev].reset( new SpectralSolver( c_realspace_ba, dm, nox_fft, noy_fft, noz_fft, do_nodal, v_galilean, cdx_vect, dt[lev], - pml, fft_periodic_single_box, update_with_rho, fft_do_time_averaging ) ); + pml_flag_false, fft_periodic_single_box, update_with_rho, fft_do_time_averaging ) ); # endif #endif m_fdtd_solver_cp[lev].reset( @@ -1242,11 +1242,11 @@ WarpX::UpperCorner(const Box& bx, int lev) } std::array<Real,3> -WarpX::LowerCornerWithGalilean (const Box& bx, const amrex::Array<amrex::Real,3>& v_galilean, int lev) +WarpX::LowerCornerWithGalilean (const Box& bx, const amrex::Array<amrex::Real,3>& vv_galilean, int lev) { amrex::Real cur_time = gett_new(lev); amrex::Real time_shift = (cur_time - time_of_last_gal_shift); - amrex::Array<amrex::Real,3> galilean_shift = { v_galilean[0]*time_shift, v_galilean[1]*time_shift, v_galilean[2]*time_shift }; + amrex::Array<amrex::Real,3> galilean_shift = { vv_galilean[0]*time_shift, vv_galilean[1]*time_shift, vv_galilean[2]*time_shift }; return WarpX::LowerCorner(bx, galilean_shift, lev); } |