1 files changed, 25 insertions, 14 deletions

diff --git a/Source/Diagnostics/Diagnostics.cpp b/Source/Diagnostics/Diagnostics.cpp
index 3259994bd..236985de4 100644
--- a/Source/Diagnostics/Diagnostics.cpp
+++ b/Source/Diagnostics/Diagnostics.cpp
@@ -12,10 +12,11 @@
 #include "FlushFormats/FlushFormatPlotfile.H"
 #include "FlushFormats/FlushFormatSensei.H"
 #include "Particles/MultiParticleContainer.H"
+#include "Utils/Algorithms/IsIn.H"
+#include "Utils/Parser/ParserUtils.H"
 #include "Utils/TextMsg.H"
 #include "Utils/WarpXAlgorithmSelection.H"
 #include "Utils/WarpXProfilerWrapper.H"
-#include "Utils/WarpXUtil.H"
 #include "WarpX.H"
 
 #include <ablastr/utils/Communication.H>
@@ -51,7 +52,8 @@ Diagnostics::BaseReadParameters ()
     amrex::ParmParse pp_diag_name(m_diag_name);
     m_file_prefix = "diags/" + m_diag_name;
     pp_diag_name.query("file_prefix", m_file_prefix);
-    queryWithParser(pp_diag_name, "file_min_digits", m_file_min_digits);
+    utils::parser::queryWithParser(
+        pp_diag_name, "file_min_digits", m_file_min_digits);
     pp_diag_name.query("format", m_format);
     pp_diag_name.query("dump_last_timestep", m_dump_last_timestep);
 
@@ -71,24 +73,25 @@ Diagnostics::BaseReadParameters ()
     }
 
     // Sanity check if user requests to plot phi
-    if (WarpXUtilStr::is_in(m_varnames_fields, "phi")){
+    if (utils::algorithms::is_in(m_varnames_fields, "phi")){
         WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
             warpx.do_electrostatic==ElectrostaticSolverAlgo::LabFrame,
             "plot phi only works if do_electrostatic = labframe");
     }
 
     // Sanity check if user requests to plot F
-    if (WarpXUtilStr::is_in(m_varnames_fields, "F")){
+    if (utils::algorithms::is_in(m_varnames_fields, "F")){
         WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
             warpx.do_dive_cleaning,
             "plot F only works if warpx.do_dive_cleaning = 1");
     }
 
     // G can be written to file only if WarpX::do_divb_cleaning = 1
-    if (WarpXUtilStr::is_in(m_varnames_fields, "G"))
+    if (utils::algorithms::is_in(m_varnames_fields, "G"))
     {
         WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
-            warpx.do_divb_cleaning, "G can be written to file only if warpx.do_divb_cleaning = 1");
+            warpx.do_divb_cleaning,
+            "G can be written to file only if warpx.do_divb_cleaning = 1");
     }
 
     // If user requests to plot proc_number for a serial run,
@@ -120,7 +123,8 @@ Diagnostics::BaseReadParameters ()
         bool do_average = true;
         pp_diag_pfield.query((var + ".do_average").c_str(), do_average);
         m_pfield_do_average.push_back(do_average);
-        Store_parserString(pp_diag_pfield, (var + "(x,y,z,ux,uy,uz)").c_str(), parser_str);
+        utils::parser::Store_parserString(
+            pp_diag_pfield, (var + "(x,y,z,ux,uy,uz)").c_str(), parser_str);
 
         WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
             parser_str != "",
@@ -169,7 +173,7 @@ Diagnostics::BaseReadParameters ()
         );
     }
 
-    if (WarpXUtilStr::is_in(m_varnames_fields, "none")){
+    if (utils::algorithms::is_in(m_varnames_fields, "none")){
         m_varnames_fields.clear();
     }
 
@@ -185,14 +189,16 @@ Diagnostics::BaseReadParameters ()
     m_lo.resize(AMREX_SPACEDIM);
     m_hi.resize(AMREX_SPACEDIM);
 
-    bool lo_specified = queryArrWithParser(pp_diag_name, "diag_lo", m_lo, 0, AMREX_SPACEDIM);
+    const bool lo_specified = utils::parser::queryArrWithParser(
+        pp_diag_name, "diag_lo", m_lo, 0, AMREX_SPACEDIM);
 
     if (!lo_specified) {
        for (int idim=0; idim < AMREX_SPACEDIM; ++idim) {
             m_lo[idim] = warpx.Geom(0).ProbLo(idim);
        }
     }
-    bool hi_specified = queryArrWithParser(pp_diag_name, "diag_hi", m_hi, 0, AMREX_SPACEDIM);
+    const bool hi_specified = utils::parser::queryArrWithParser(
+        pp_diag_name, "diag_hi", m_hi, 0, AMREX_SPACEDIM);
     if (!hi_specified) {
        for (int idim =0; idim < AMREX_SPACEDIM; ++idim) {
             m_hi[idim] = warpx.Geom(0).ProbHi(idim);
@@ -220,7 +226,9 @@ Diagnostics::BaseReadParameters ()
     // Initialize cr_ratio with default value of 1 for each dimension.
     amrex::Vector<int> cr_ratio(AMREX_SPACEDIM, 1);
     // Read user-defined coarsening ratio for the output MultiFab.
-    bool cr_specified = queryArrWithParser(pp_diag_name, "coarsening_ratio", cr_ratio, 0, AMREX_SPACEDIM);
+    const bool cr_specified =
+        utils::parser::queryArrWithParser(
+            pp_diag_name, "coarsening_ratio", cr_ratio, 0, AMREX_SPACEDIM);
     if (cr_specified) {
        for (int idim =0; idim < AMREX_SPACEDIM; ++idim) {
            m_crse_ratio[idim] = cr_ratio[idim];
@@ -228,7 +236,8 @@ Diagnostics::BaseReadParameters ()
     }
 
     // Names of species to write to output
-    bool species_specified = pp_diag_name.queryarr("species", m_output_species_names);
+    const bool species_specified =
+        pp_diag_name.queryarr("species", m_output_species_names);
 
 
     // Auxiliary variables
@@ -326,8 +335,10 @@ Diagnostics::InitData ()
         m_output_species_names.clear();
     } else {
         amrex::Vector <amrex::Real> dummy_val(AMREX_SPACEDIM);
-        if ( queryArrWithParser(pp_diag_name, "diag_lo", dummy_val, 0, AMREX_SPACEDIM) ||
-             queryArrWithParser(pp_diag_name, "diag_hi", dummy_val, 0, AMREX_SPACEDIM) ) {
+        if ( utils::parser::queryArrWithParser(
+                pp_diag_name, "diag_lo", dummy_val, 0, AMREX_SPACEDIM) ||
+             utils::parser::queryArrWithParser(
+                pp_diag_name, "diag_hi", dummy_val, 0, AMREX_SPACEDIM) ) {
             // set geometry filter for particle-diags to true when the diagnostic domain-extent
             // is specified by the user.
             // Note that the filter is set for every ith snapshot, and the number of snapshots