aboutsummaryrefslogtreecommitdiff
path: root/Source/FieldSolver/SpectralSolver
diff options
context:
space:
mode:
authorGravatar Luca Fedeli <luca.fedeli@cea.fr> 2020-08-24 23:14:30 +0200
committerGravatar GitHub <noreply@github.com> 2020-08-24 14:14:30 -0700
commitbb58c764f9f21f8baac5e2fb1d81fed4983d1242 (patch)
tree3e1f5914d8f1e2be1168b79509718719745ebb93 /Source/FieldSolver/SpectralSolver
parent78f9be325d894bbae867aa279efdfd2212690825 (diff)
downloadWarpX-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/SpectralSolver')
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralAlgorithms/AvgGalileanAlgorithm.cpp14
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp14
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H9
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.cpp2
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralKSpace.H2
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp14
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralSolver.H4
7 files changed, 35 insertions, 24 deletions
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,