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/Particles/ParticleBoundaries.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'Source/Particles/ParticleBoundaries.cpp') diff --git a/Source/Particles/ParticleBoundaries.cpp b/Source/Particles/ParticleBoundaries.cpp index 2bdbd0d14..a6e80717e 100644 --- a/Source/Particles/ParticleBoundaries.cpp +++ b/Source/Particles/ParticleBoundaries.cpp @@ -7,6 +7,8 @@ #include "ParticleBoundaries.H" +#include "Utils/Parser/ParserUtils.H" + ParticleBoundaries::ParticleBoundaries () noexcept { SetAll(ParticleBoundaryType::Absorbing); @@ -64,18 +66,24 @@ ParticleBoundaries::CheckAll (ParticleBoundaryType bc) void ParticleBoundaries::BuildReflectionModelParsers () { - reflection_model_xlo_parser = std::make_unique(makeParser(reflection_model_xlo_str, {"v"})); + reflection_model_xlo_parser = std::make_unique( + utils::parser::makeParser(reflection_model_xlo_str, {"v"})); data.reflection_model_xlo = reflection_model_xlo_parser->compile<1>(); - reflection_model_xhi_parser = std::make_unique(makeParser(reflection_model_xhi_str, {"v"})); + reflection_model_xhi_parser = std::make_unique( + utils::parser::makeParser(reflection_model_xhi_str, {"v"})); data.reflection_model_xhi = reflection_model_xhi_parser->compile<1>(); #ifdef WARPX_DIM_3D - reflection_model_ylo_parser = std::make_unique(makeParser(reflection_model_ylo_str, {"v"})); + reflection_model_ylo_parser = std::make_unique( + utils::parser::makeParser(reflection_model_ylo_str, {"v"})); data.reflection_model_ylo = reflection_model_ylo_parser->compile<1>(); - reflection_model_yhi_parser = std::make_unique(makeParser(reflection_model_yhi_str, {"v"})); + reflection_model_yhi_parser = std::make_unique( + utils::parser::makeParser(reflection_model_yhi_str, {"v"})); data.reflection_model_yhi = reflection_model_yhi_parser->compile<1>(); #endif - reflection_model_zlo_parser = std::make_unique(makeParser(reflection_model_zlo_str, {"v"})); + reflection_model_zlo_parser = std::make_unique( + utils::parser::makeParser(reflection_model_zlo_str, {"v"})); data.reflection_model_zlo = reflection_model_zlo_parser->compile<1>(); - reflection_model_zhi_parser = std::make_unique(makeParser(reflection_model_zhi_str, {"v"})); + reflection_model_zhi_parser = std::make_unique( + utils::parser::makeParser(reflection_model_zhi_str, {"v"})); data.reflection_model_zhi = reflection_model_zhi_parser->compile<1>(); } -- cgit v1.2.3