diff options
Diffstat (limited to 'Source/Particles/Collision/BinaryCollision')
3 files changed, 11 insertions, 9 deletions
diff --git a/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H b/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H index 0acdc9af8..a1b8979e8 100644 --- a/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H +++ b/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H @@ -11,7 +11,7 @@ #include "ElasticCollisionPerez.H" #include "Particles/Pusher/GetAndSetPosition.H" #include "Particles/WarpXParticleContainer.H" -#include "Utils/WarpXUtil.H" +#include "Utils/Parser/ParserUtils.H" #include <AMReX_DenseBins.H> #include <AMReX_ParmParse.H> @@ -49,7 +49,8 @@ public: amrex::ParmParse pp_collision_name(collision_name); // default Coulomb log, if < 0, will be computed automatically m_CoulombLog = -1.0_prt; - queryWithParser(pp_collision_name, "CoulombLog", m_CoulombLog); + utils::parser::queryWithParser( + pp_collision_name, "CoulombLog", m_CoulombLog); } /** diff --git a/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H b/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H index 391682b46..25624469d 100644 --- a/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H +++ b/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H @@ -14,8 +14,8 @@ #include "Particles/Pusher/GetAndSetPosition.H" #include "Particles/MultiParticleContainer.H" #include "Particles/WarpXParticleContainer.H" +#include "Utils/Parser/ParserUtils.H" #include "Utils/TextMsg.H" -#include "Utils/WarpXUtil.H" #include "WarpX.H" #include <AMReX_Algorithm.H> @@ -94,15 +94,17 @@ public: // default fusion multiplier m_fusion_multiplier = 1.0_prt; - queryWithParser(pp_collision_name, "fusion_multiplier", m_fusion_multiplier); + utils::parser::queryWithParser( + pp_collision_name, "fusion_multiplier", m_fusion_multiplier); // default fusion probability threshold m_probability_threshold = 0.02_prt; - queryWithParser(pp_collision_name, "fusion_probability_threshold", - m_probability_threshold); + utils::parser::queryWithParser( + pp_collision_name, "fusion_probability_threshold", m_probability_threshold); // default fusion probability target_value m_probability_target_value = 0.002_prt; - queryWithParser(pp_collision_name, "fusion_probability_target_value", - m_probability_target_value); + utils::parser::queryWithParser( + pp_collision_name, "fusion_probability_target_value", + m_probability_target_value); } /** diff --git a/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H b/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H index 510c59094..be77ae9e0 100644 --- a/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H +++ b/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H @@ -15,7 +15,6 @@ #include "Particles/ParticleCreation/SmartCopy.H" #include "Particles/MultiParticleContainer.H" #include "Particles/WarpXParticleContainer.H" -#include "Utils/WarpXUtil.H" #include "WarpX.H" #include <AMReX_DenseBins.H> |