Use Clear Naming Standard for ParmParse Variables (#1809)

1 files changed, 25 insertions, 25 deletions

diff --git a/Source/Utils/WarpXUtil.cpp b/Source/Utils/WarpXUtil.cpp
index 2d95ad3a5..a87027176 100644
--- a/Source/Utils/WarpXUtil.cpp
+++ b/Source/Utils/WarpXUtil.cpp
@@ -21,12 +21,12 @@ using namespace amrex;
 void ReadBoostedFrameParameters(Real& gamma_boost, Real& beta_boost,
                                 Vector<int>& boost_direction)
 {
-    ParmParse pp("warpx");
-    queryWithParser(pp, "gamma_boost", gamma_boost);
+    ParmParse pp_warpx("warpx");
+    queryWithParser(pp_warpx, "gamma_boost", gamma_boost);
     if( gamma_boost > 1. ) {
         beta_boost = std::sqrt(1.-1./pow(gamma_boost,2));
         std::string s;
-        pp.get("boost_direction", s);
+        pp_warpx.get("boost_direction", s);
         if (s == "x" || s == "X") {
             boost_direction[0] = 1;
         }
@@ -65,14 +65,14 @@ void ConvertLabParamsToBoost()
     Vector<Real> slice_lo(AMREX_SPACEDIM);
     Vector<Real> slice_hi(AMREX_SPACEDIM);
 
-    ParmParse pp_geom("geometry");
-    ParmParse pp_wpx("warpx");
+    ParmParse pp_geometry("geometry");
+    ParmParse pp_warpx("warpx");
     ParmParse pp_amr("amr");
     ParmParse pp_slice("slice");
 
-    pp_geom.getarr("prob_lo",prob_lo,0,AMREX_SPACEDIM);
+    pp_geometry.getarr("prob_lo",prob_lo,0,AMREX_SPACEDIM);
     AMREX_ALWAYS_ASSERT(prob_lo.size() == AMREX_SPACEDIM);
-    pp_geom.getarr("prob_hi",prob_hi,0,AMREX_SPACEDIM);
+    pp_geometry.getarr("prob_hi",prob_hi,0,AMREX_SPACEDIM);
     AMREX_ALWAYS_ASSERT(prob_hi.size() == AMREX_SPACEDIM);
 
     pp_slice.queryarr("dom_lo",slice_lo,0,AMREX_SPACEDIM);
@@ -83,8 +83,8 @@ void ConvertLabParamsToBoost()
 
     pp_amr.query("max_level", max_level);
     if (max_level > 0){
-      pp_wpx.getarr("fine_tag_lo", fine_tag_lo);
-      pp_wpx.getarr("fine_tag_hi", fine_tag_hi);
+      pp_warpx.getarr("fine_tag_lo", fine_tag_lo);
+      pp_warpx.getarr("fine_tag_hi", fine_tag_hi);
     }
 
 
@@ -112,11 +112,11 @@ void ConvertLabParamsToBoost()
         }
     }
 
-    pp_geom.addarr("prob_lo", prob_lo);
-    pp_geom.addarr("prob_hi", prob_hi);
+    pp_geometry.addarr("prob_lo", prob_lo);
+    pp_geometry.addarr("prob_hi", prob_hi);
     if (max_level > 0){
-      pp_wpx.addarr("fine_tag_lo", fine_tag_lo);
-      pp_wpx.addarr("fine_tag_hi", fine_tag_hi);
+      pp_warpx.addarr("fine_tag_lo", fine_tag_lo);
+      pp_warpx.addarr("fine_tag_hi", fine_tag_hi);
     }
 
     pp_slice.addarr("dom_lo",slice_lo);
@@ -195,12 +195,12 @@ WarpXParser makeParser (std::string const& parse_function, std::vector<std::stri
 {
     WarpXParser parser(parse_function);
     parser.registerVariables(varnames);
-    ParmParse pp("my_constants");
+    ParmParse pp_my_constants("my_constants");
     std::set<std::string> symbols = parser.symbols();
     for (auto const& v : varnames) symbols.erase(v.c_str());
     for (auto it = symbols.begin(); it != symbols.end(); ) {
         Real v;
-        if (pp.query(it->c_str(), v)) {
+        if (pp_my_constants.query(it->c_str(), v)) {
             parser.setConstant(*it, v);
             it = symbols.erase(it);
         } else if (std::strcmp(it->c_str(), "q_e") == 0) {
@@ -275,8 +275,8 @@ void CheckGriddingForRZSpectral ()
     amrex::Abort("CheckGriddingForRZSpectral: WarpX was not built with RZ geometry.");
 #else
 
-    ParmParse pp("algo");
-    int maxwell_solver_id = GetAlgorithmInteger(pp, "maxwell_solver");
+    ParmParse pp_algo("algo");
+    int maxwell_solver_id = GetAlgorithmInteger(pp_algo, "maxwell_solver");
 
     // only check for PSATD in RZ
     if (maxwell_solver_id != MaxwellSolverAlgo::PSATD)
@@ -358,20 +358,20 @@ void ReadBCParams ()
     amrex::Vector<std::string> particle_BC_lo(AMREX_SPACEDIM,"default");
     amrex::Vector<std::string> particle_BC_hi(AMREX_SPACEDIM,"default");
     amrex::Vector<int> geom_periodicity(AMREX_SPACEDIM,0);
-    ParmParse pp_geom("geometry");
-    if (pp_geom.queryarr("is_periodic", geom_periodicity)) {
+    ParmParse pp_geometry("geometry");
+    if (pp_geometry.queryarr("is_periodic", geom_periodicity)) {
         return;
         // When all boundary conditions are supported, the abort statement below will be introduced
         amrex::Abort("geometry.is_periodic is not supported. Please use `boundary.field_lo`, `boundary.field_hi` to specifiy field boundary conditions and 'boundary.particle_lo', 'boundary.particle_hi'  to specify particle boundary conditions.");
     }
     // particle boundary may not be explicitly specified for some applications
     bool particle_boundary_specified = false;
-    ParmParse pp("boundary");
-    pp.queryarr("field_lo", field_BC_lo, 0, AMREX_SPACEDIM);
-    pp.queryarr("field_hi", field_BC_hi, 0, AMREX_SPACEDIM);
-    if (pp.queryarr("particle_lo", particle_BC_lo, 0, AMREX_SPACEDIM))
+    ParmParse pp_boundary("boundary");
+    pp_boundary.queryarr("field_lo", field_BC_lo, 0, AMREX_SPACEDIM);
+    pp_boundary.queryarr("field_hi", field_BC_hi, 0, AMREX_SPACEDIM);
+    if (pp_boundary.queryarr("particle_lo", particle_BC_lo, 0, AMREX_SPACEDIM))
         particle_boundary_specified = true;
-    if (pp.queryarr("particle_hi", particle_BC_hi, 0, AMREX_SPACEDIM))
+    if (pp_boundary.queryarr("particle_hi", particle_BC_hi, 0, AMREX_SPACEDIM))
         particle_boundary_specified = true;
     AMREX_ALWAYS_ASSERT(field_BC_lo.size() == AMREX_SPACEDIM);
     AMREX_ALWAYS_ASSERT(field_BC_hi.size() == AMREX_SPACEDIM);
@@ -410,7 +410,7 @@ void ReadBCParams ()
         }
     }
 
-    pp_geom.addarr("is_periodic", geom_periodicity);
+    pp_geometry.addarr("is_periodic", geom_periodicity);
 }
 
 namespace WarpXUtilMsg{