From 5a12391f0c2350e9083bf3138da210eb81707e6e Mon Sep 17 00:00:00 2001 From: Neïl Zaim <49716072+NeilZaim@users.noreply.github.com> Date: Tue, 12 Oct 2021 02:39:58 +0200 Subject: 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 --- Source/Parallelization/GuardCellManager.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/Parallelization/GuardCellManager.cpp') diff --git a/Source/Parallelization/GuardCellManager.cpp b/Source/Parallelization/GuardCellManager.cpp index 8dd44f706..6e3b46645 100644 --- a/Source/Parallelization/GuardCellManager.cpp +++ b/Source/Parallelization/GuardCellManager.cpp @@ -17,6 +17,7 @@ #include "Filter/NCIGodfreyFilter.H" #include "Utils/WarpXAlgorithmSelection.H" #include "Utils/WarpXConst.H" +#include "Utils/WarpXUtil.H" #include #include @@ -42,8 +43,8 @@ guardCellManager::Init ( const int nci_corr_stencil, const int maxwell_solver_id, const int max_level, - const amrex::Array v_galilean, - const amrex::Array v_comoving, + const amrex::Vector v_galilean, + const amrex::Vector v_comoving, const bool safe_guard_cells, const int do_electrostatic) { @@ -164,9 +165,9 @@ guardCellManager::Init ( int ngFFt_z = (do_nodal || galilean) ? noz_fft : noz_fft / 2; ParmParse pp_psatd("psatd"); - pp_psatd.query("nx_guard", ngFFt_x); - pp_psatd.query("ny_guard", ngFFt_y); - pp_psatd.query("nz_guard", ngFFt_z); + queryWithParser(pp_psatd, "nx_guard", ngFFt_x); + queryWithParser(pp_psatd, "ny_guard", ngFFt_y); + queryWithParser(pp_psatd, "nz_guard", ngFFt_z); #if (AMREX_SPACEDIM == 3) IntVect ngFFT = IntVect(ngFFt_x, ngFFt_y, ngFFt_z); -- cgit v1.2.3