diff options
Diffstat (limited to 'Source/FieldSolver')
7 files changed, 14 insertions, 8 deletions
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp index fbc62f661..6eb7caacc 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp @@ -32,7 +32,7 @@ void FiniteDifferenceSolver::EvolveBPML ( // Select algorithm (The choice of algorithm is a runtime option, // but we compile code for each algorithm, using templates) #ifdef WARPX_DIM_RZ - amrex::ignore_unused(Bfield, Efield, dt); + amrex::ignore_unused(Bfield, Efield, dt, dive_cleaning); amrex::Abort("PML are not implemented in cylindrical geometry."); #else if (m_do_nodal) { diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H index 1978a61a5..2fb0c8e80 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H +++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H @@ -114,7 +114,7 @@ struct CylindricalYeeAlgorithm { Real const inv_dr = coefs_r[0]; return inv_dr*( F(i+1,j,k,comp) - F(i,j,k,comp) ); - }; + } /** * Perform derivative along r on a nodal grid, from a cell-centered field `F` */ diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H index d5efe5b74..efa907d14 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H @@ -41,7 +41,7 @@ class PsatdAlgorithm : public SpectralBaseAlgorithm } else { return SpectralFieldIndex::n_fields; } - }; + } // TODO Add Doxygen docs void InitializeSpectralCoefficients ( diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp index b96d5fa93..86d9f9696 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp @@ -299,7 +299,7 @@ PsatdAlgorithmRZ::CurrentCorrection (const int lev, } void -PsatdAlgorithmRZ::VayDeposition (const int lev /**/, +PsatdAlgorithmRZ::VayDeposition (const int /* lev */, SpectralFieldDataRZ& /*field_data*/, std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/) { diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H index c19d2fc5e..51bba5b87 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithmRZ.H @@ -26,7 +26,7 @@ class SpectralBaseAlgorithmRZ // The destructor should also be a virtual function, so that // a pointer to subclass of `SpectraBaseAlgorithm` actually // calls the subclass's destructor. - virtual ~SpectralBaseAlgorithmRZ() {}; + virtual ~SpectralBaseAlgorithmRZ() {} /** * \brief Virtual function for current correction in Fourier space @@ -74,7 +74,7 @@ class SpectralBaseAlgorithmRZ int const norder_z, bool const nodal) // Compute and assign the modified k vectors : modified_kz_vec(spectral_kspace.getModifiedKComponent(dm, 1, norder_z, nodal)) - {}; + {} // Modified finite-order vectors KVectorComponent modified_kz_vec; diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/BesselRoots.H b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/BesselRoots.H index a44d192fb..6465d119e 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/BesselRoots.H +++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/BesselRoots.H @@ -32,7 +32,10 @@ ! (www.jpmoreau.fr) ! ------------------------------------------------------------------------ */ -using amrex::operator""_rt; +#include <AMReX_REAL.H> + +#include <cmath> + void SecantRootFinder(int n, int nitmx, amrex::Real tol, amrex::Real *zeroj, int *ier); @@ -52,6 +55,8 @@ void SecantRootFinder(int n, int nitmx, amrex::Real tol, amrex::Real *zeroj, int * handbook of mathematical functions */ void GetBesselRoots(int n, int nk, amrex::Vector<amrex::Real>& roots, amrex::Vector<int> &ier) { + using namespace amrex::literals; + amrex::Real zeroj; int ierror, ik, k; @@ -125,6 +130,7 @@ void GetBesselRoots(int n, int nk, amrex::Vector<amrex::Real>& roots, amrex::Vec } void SecantRootFinder(int n, int nitmx, amrex::Real tol, amrex::Real *zeroj, int *ier) { + using namespace amrex::literals; amrex::Real p0, p1, q0, q1, dp, p; amrex::Real c[2]; diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.H b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.H index e24123f78..82cf48fe4 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.H +++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/SpectralHankelTransformer.H @@ -22,7 +22,7 @@ class SpectralHankelTransformer { public: - SpectralHankelTransformer () {}; + SpectralHankelTransformer () {} SpectralHankelTransformer (const int nr, const int n_rz_azimuthal_modes, |