diff options
author | 2022-10-10 20:36:14 +0200 | |
---|---|---|
committer | 2022-10-10 11:36:14 -0700 | |
commit | e9cc65ffeb0684a97618b67c2164d95ea497226c (patch) | |
tree | ed65f7ac86cc4e8945021dc36a79c8bc246c150d /Source/Diagnostics/ParticleDiag/ParticleDiag.cpp | |
parent | 56e04c1b911f9399662c4ff9ecf6630d686cc220 (diff) | |
download | WarpX-e9cc65ffeb0684a97618b67c2164d95ea497226c.tar.gz WarpX-e9cc65ffeb0684a97618b67c2164d95ea497226c.tar.zst WarpX-e9cc65ffeb0684a97618b67c2164d95ea497226c.zip |
Partial refactoring of the utils directory (#3404)
* initial work to clean WarpX Utils
* remove AMRCore from Ionization tables
* progress
* refactoring of a part of the utils directory
* fix bug
* fixed bug
* fixed bug
* remove debug line accidentally slipped into the code
* remove debug line accidentally slipped into the code
* remove debug line accidentally slipped into the code
* cleaning
* fixed bug
Diffstat (limited to 'Source/Diagnostics/ParticleDiag/ParticleDiag.cpp')
-rw-r--r-- | Source/Diagnostics/ParticleDiag/ParticleDiag.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp b/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp index deab2ba0b..f8c0f7b37 100644 --- a/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp +++ b/Source/Diagnostics/ParticleDiag/ParticleDiag.cpp @@ -2,8 +2,8 @@ #include "Diagnostics/ParticleDiag/ParticleDiag.H" #include "Particles/WarpXParticleContainer.H" +#include "Utils/Parser/ParserUtils.H" #include "Utils/TextMsg.H" -#include "Utils/WarpXUtil.H" #include "WarpX.H" #include <AMReX_ParmParse.H> @@ -51,19 +51,19 @@ ParticleDiag::ParticleDiag(std::string diag_name, std::string name, WarpXParticl #endif // build filter functors - m_do_random_filter = queryWithParser(pp_diag_name_species_name, "random_fraction", - m_random_fraction); - m_do_uniform_filter = queryWithParser(pp_diag_name_species_name, "uniform_stride", - m_uniform_stride); + m_do_random_filter = utils::parser::queryWithParser( + pp_diag_name_species_name, "random_fraction", m_random_fraction); + m_do_uniform_filter = utils::parser::queryWithParser( + pp_diag_name_species_name, "uniform_stride",m_uniform_stride); std::string buf; m_do_parser_filter = pp_diag_name_species_name.query("plot_filter_function(t,x,y,z,ux,uy,uz)", buf); if (m_do_parser_filter) { std::string function_string = ""; - Store_parserString(pp_diag_name_species_name,"plot_filter_function(t,x,y,z,ux,uy,uz)", - function_string); + utils::parser::Store_parserString( + pp_diag_name_species_name,"plot_filter_function(t,x,y,z,ux,uy,uz)", function_string); m_particle_filter_parser = std::make_unique<amrex::Parser>( - makeParser(function_string,{"t","x","y","z","ux","uy","uz"})); + utils::parser::makeParser(function_string,{"t","x","y","z","ux","uy","uz"})); } } |