From e9cc65ffeb0684a97618b67c2164d95ea497226c Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Mon, 10 Oct 2022 20:36:14 +0200 Subject: 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 --- Source/Initialization/VelocityProperties.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Source/Initialization/VelocityProperties.cpp') diff --git a/Source/Initialization/VelocityProperties.cpp b/Source/Initialization/VelocityProperties.cpp index 59788fc7e..95f41d403 100644 --- a/Source/Initialization/VelocityProperties.cpp +++ b/Source/Initialization/VelocityProperties.cpp @@ -8,6 +8,7 @@ #include "VelocityProperties.H" +#include "Utils/Parser/ParserUtils.H" #include "Utils/TextMsg.H" VelocityProperties::VelocityProperties (amrex::ParmParse& pp) { @@ -45,7 +46,7 @@ VelocityProperties::VelocityProperties (amrex::ParmParse& pp) { pp.query("beta_distribution_type", vel_dist_s); if (vel_dist_s == "constant") { - queryWithParser(pp, "beta", m_velocity); + utils::parser::queryWithParser(pp, "beta", m_velocity); m_type = VelConstantValue; WARPX_ALWAYS_ASSERT_WITH_MESSAGE( m_velocity > -1 && m_velocity < 1, @@ -55,9 +56,10 @@ VelocityProperties::VelocityProperties (amrex::ParmParse& pp) { } else if (vel_dist_s == "parser") { std::string str_beta_function; - Store_parserString(pp, "beta_function(x,y,z)", str_beta_function); + utils::parser::Store_parserString(pp, "beta_function(x,y,z)", str_beta_function); m_ptr_velocity_parser = - std::make_unique(makeParser(str_beta_function,{"x","y","z"})); + std::make_unique( + utils::parser::makeParser(str_beta_function,{"x","y","z"})); m_type = VelParserFunction; } else { -- cgit v1.2.3