diff options
author | 2021-10-12 02:39:58 +0200 | |
---|---|---|
committer | 2021-10-11 17:39:58 -0700 | |
commit | 5a12391f0c2350e9083bf3138da210eb81707e6e (patch) | |
tree | 5755fcbc17dfd120e2f3ad8fd019de7b15aca24f /Source/FieldSolver/SpectralSolver | |
parent | d367eb0c15c36baf390d0c9ec7bc068fe25490b7 (diff) | |
download | WarpX-5a12391f0c2350e9083bf3138da210eb81707e6e.tar.gz WarpX-5a12391f0c2350e9083bf3138da210eb81707e6e.tar.zst WarpX-5a12391f0c2350e9083bf3138da210eb81707e6e.zip |
Use parser for more input parameters (#2386)
* Use parser for more input parameters
* Fix PSATD compilation and apply suggestions from code review
* Avoid out of bound array access for num_particles_per_cell_each_dim
* Fix few input files with respect to num_particles_per_cell_each_dim
* Fix get that incorrectly became query
Diffstat (limited to 'Source/FieldSolver/SpectralSolver')
10 files changed, 15 insertions, 15 deletions
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H index 40dfeef38..cc9e7e4fc 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H @@ -34,7 +34,7 @@ class ComovingPsatdAlgorithm : public SpectralBaseAlgorithm const int norder_z, const bool nodal, const amrex::IntVect& fill_guards, - const amrex::Array<amrex::Real,3>& v_comoving, + const amrex::Vector<amrex::Real>& v_comoving, const amrex::Real dt, const bool update_with_rho); @@ -95,7 +95,7 @@ class ComovingPsatdAlgorithm : public SpectralBaseAlgorithm KVectorComponent kz_vec; // Additional member variables - amrex::Array<amrex::Real,3> m_v_comoving; + amrex::Vector<amrex::Real> m_v_comoving; amrex::Real m_dt; }; diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp index f80ee7749..ba9613d3b 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp @@ -26,7 +26,7 @@ ComovingPsatdAlgorithm::ComovingPsatdAlgorithm (const SpectralKSpace& spectral_k const int norder_x, const int norder_y, const int norder_z, const bool nodal, const amrex::IntVect& fill_guards, - const amrex::Array<amrex::Real, 3>& v_comoving, + const amrex::Vector<amrex::Real>& v_comoving, const amrex::Real dt, const bool update_with_rho) // Members initialization diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H index 8ac6a1d58..0907cf37f 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H @@ -21,7 +21,7 @@ class GalileanPsatdAlgorithmRZ : public SpectralBaseAlgorithmRZ const SpectralFieldIndex& spectral_index, int const n_rz_azimuthal_modes, int const norder_z, bool const nodal, - const amrex::Array<amrex::Real,3>& v_galilean, + const amrex::Vector<amrex::Real>& v_galilean, amrex::Real const dt_step, bool const update_with_rho); // Redefine functions from base class @@ -65,7 +65,7 @@ class GalileanPsatdAlgorithmRZ : public SpectralBaseAlgorithmRZ bool coefficients_initialized; // Note that dt and v_galilean are saved to use in InitializeSpectralCoefficients amrex::Real const m_dt; - amrex::Array<amrex::Real,3> m_v_galilean; + amrex::Vector<amrex::Real> m_v_galilean; bool m_update_with_rho; SpectralRealCoefficients C_coef, S_ck_coef; diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp index 79fee3c2e..4fa68b681 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp @@ -20,7 +20,7 @@ GalileanPsatdAlgorithmRZ::GalileanPsatdAlgorithmRZ (SpectralKSpaceRZ const & spe const SpectralFieldIndex& spectral_index, int const n_rz_azimuthal_modes, int const norder_z, bool const nodal, - const amrex::Array<amrex::Real,3>& v_galilean, + const amrex::Vector<amrex::Real>& v_galilean, amrex::Real const dt, bool const update_with_rho) // Initialize members of base class diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H index 1df77f6f3..d0dce0fef 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H @@ -54,7 +54,7 @@ class PsatdAlgorithm : public SpectralBaseAlgorithm const int norder_z, const bool nodal, const amrex::IntVect& fill_guards, - const amrex::Array<amrex::Real,3>& v_galilean, + const amrex::Vector<amrex::Real>& v_galilean, const amrex::Real dt, const bool update_with_rho, const bool time_averaging, @@ -162,7 +162,7 @@ class PsatdAlgorithm : public SpectralBaseAlgorithm KVectorComponent modified_kz_vec_centered; // Other member variables - amrex::Array<amrex::Real,3> m_v_galilean; + amrex::Vector<amrex::Real> m_v_galilean; amrex::Real m_dt; bool m_update_with_rho; bool m_time_averaging; diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp index a605835e5..b3a4ec885 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp @@ -35,7 +35,7 @@ PsatdAlgorithm::PsatdAlgorithm( const int norder_z, const bool nodal, const amrex::IntVect& fill_guards, - const amrex::Array<amrex::Real,3>& v_galilean, + const amrex::Vector<amrex::Real>& v_galilean, const amrex::Real dt, const bool update_with_rho, const bool time_averaging, diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H index 50b9978f4..b2a33c323 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H +++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H @@ -72,8 +72,8 @@ class SpectralSolver const int norder_x, const int norder_y, const int norder_z, const bool nodal, const amrex::IntVect& fill_guards, - const amrex::Array<amrex::Real,3>& v_galilean, - const amrex::Array<amrex::Real,3>& v_comoving, + const amrex::Vector<amrex::Real>& v_galilean, + const amrex::Vector<amrex::Real>& v_comoving, const amrex::RealVect dx, const amrex::Real dt, const bool pml, diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp index 8dd6b2bd9..a6b2f0aa4 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp @@ -24,8 +24,8 @@ SpectralSolver::SpectralSolver( const int norder_x, const int norder_y, const int norder_z, const bool nodal, const amrex::IntVect& fill_guards, - const amrex::Array<amrex::Real,3>& v_galilean, - const amrex::Array<amrex::Real,3>& v_comoving, + const amrex::Vector<amrex::Real>& v_galilean, + const amrex::Vector<amrex::Real>& v_comoving, const amrex::RealVect dx, const amrex::Real dt, const bool pml, const bool periodic_single_box, const bool update_with_rho, diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.H b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.H index e08d5741c..52f422799 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.H +++ b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.H @@ -32,7 +32,7 @@ class SpectralSolverRZ amrex::DistributionMapping const & dm, int const n_rz_azimuthal_modes, int const norder_z, bool const nodal, - const amrex::Array<amrex::Real,3>& v_galilean, + const amrex::Vector<amrex::Real>& v_galilean, amrex::RealVect const dx, amrex::Real const dt, bool const update_with_rho, const bool fft_do_time_averaging, diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp index 12c2dabf2..b47dfa4ad 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp @@ -30,7 +30,7 @@ SpectralSolverRZ::SpectralSolverRZ (const int lev, amrex::DistributionMapping const & dm, int const n_rz_azimuthal_modes, int const norder_z, bool const nodal, - const amrex::Array<amrex::Real,3>& v_galilean, + const amrex::Vector<amrex::Real>& v_galilean, amrex::RealVect const dx, amrex::Real const dt, bool const update_with_rho, const bool fft_do_time_averaging, |