diff options
Diffstat (limited to 'Source/FieldSolver/FiniteDifferenceSolver')
3 files changed, 36 insertions, 12 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; |