diff options
Diffstat (limited to 'Source/Particles/Collision/BinaryCollision')
4 files changed, 9 insertions, 7 deletions
diff --git a/Source/Particles/Collision/BinaryCollision/BinaryCollision.H b/Source/Particles/Collision/BinaryCollision/BinaryCollision.H index 2c1cdc689..ea439a071 100644 --- a/Source/Particles/Collision/BinaryCollision/BinaryCollision.H +++ b/Source/Particles/Collision/BinaryCollision/BinaryCollision.H @@ -18,6 +18,7 @@ #include "Particles/MultiParticleContainer.H" #include "Particles/WarpXParticleContainer.H" #include "Utils/ParticleUtils.H" +#include "Utils/TextMsg.H" #include "Utils/WarpXAlgorithmSelection.H" #include "WarpX.H" @@ -87,7 +88,7 @@ public: : CollisionBase(collision_name) { if(m_species_names.size() != 2) - amrex::Abort("Binary collision " + collision_name + " must have exactly two species."); + WARPX_ABORT_WITH_MESSAGE("Binary collision " + collision_name + " must have exactly two species."); if (m_species_names[0] == m_species_names[1]) m_isSameSpecies = true; diff --git a/Source/Particles/Collision/BinaryCollision/BinaryCollisionUtils.cpp b/Source/Particles/Collision/BinaryCollision/BinaryCollisionUtils.cpp index d7cc754d0..c94cd8812 100644 --- a/Source/Particles/Collision/BinaryCollision/BinaryCollisionUtils.cpp +++ b/Source/Particles/Collision/BinaryCollision/BinaryCollisionUtils.cpp @@ -63,7 +63,7 @@ namespace BinaryCollisionUtils{ ||(product_species1.AmIA<PhysicalSpecies::hydrogen1>() && product_species2.AmIA<PhysicalSpecies::hydrogen3>())){ return NuclearFusionType::DeuteriumDeuteriumToProtonTritium; } else { - amrex::Abort("ERROR: Product species of deuterium-deuterium fusion must be of type helium3 and neutron, or tritium and proton"); + WARPX_ABORT_WITH_MESSAGE("ERROR: Product species of deuterium-deuterium fusion must be of type helium3 and neutron, or tritium and proton"); } } else if ((species1.AmIA<PhysicalSpecies::hydrogen2>() && species2.AmIA<PhysicalSpecies::helium3>()) @@ -97,7 +97,7 @@ namespace BinaryCollisionUtils{ "ERROR: Product species of proton-boron fusion must be of type alpha"); return NuclearFusionType::ProtonBoronToAlphas; } - amrex::Abort("Binary nuclear fusion not implemented between species " + + WARPX_ABORT_WITH_MESSAGE("Binary nuclear fusion not implemented between species " + species_names[0] + " of type " + species1.getSpeciesTypeName() + " and species " + species_names[1] + " of type " + species2.getSpeciesTypeName()); @@ -114,7 +114,7 @@ namespace BinaryCollisionUtils{ NuclearFusionType fusion_type = get_nuclear_fusion_type(collision_name, mypc); return nuclear_fusion_type_to_collision_type(fusion_type); } - amrex::Abort(type + " is not a valid type of collision that creates new particles"); + WARPX_ABORT_WITH_MESSAGE(type + " is not a valid type of collision that creates new particles"); return CollisionType::Undefined; } @@ -130,7 +130,7 @@ namespace BinaryCollisionUtils{ return CollisionType::DeuteriumHeliumToProtonHeliumFusion; if (fusion_type == NuclearFusionType::ProtonBoronToAlphas) return CollisionType::ProtonBoronToAlphasFusion; - amrex::Abort("Invalid nuclear fusion type"); + WARPX_ABORT_WITH_MESSAGE("Invalid nuclear fusion type"); return CollisionType::Undefined; } } diff --git a/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H b/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H index 2dcbe22e9..c4e769d2c 100644 --- a/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H +++ b/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H @@ -59,7 +59,7 @@ public: using namespace amrex::literals; #ifdef AMREX_SINGLE_PRECISION_PARTICLES - amrex::Abort("Nuclear fusion module does not currently work with single precision"); + WARPX_ABORT_WITH_MESSAGE("Nuclear fusion module does not currently work with single precision"); #endif m_fusion_type = BinaryCollisionUtils::get_nuclear_fusion_type(collision_name, mypc); diff --git a/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.cpp b/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.cpp index 3b1951107..f1efb9716 100644 --- a/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.cpp +++ b/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.cpp @@ -9,6 +9,7 @@ #include "BinaryCollisionUtils.H" #include "Particles/MultiParticleContainer.H" +#include "Utils/TextMsg.H" #include <AMReX_GpuContainers.H> #include <AMReX_ParmParse.H> @@ -49,7 +50,7 @@ ParticleCreationFunc::ParticleCreationFunc (const std::string collision_name, } else { - amrex::Abort("Unknown collision type in ParticleCreationFunc"); + WARPX_ABORT_WITH_MESSAGE("Unknown collision type in ParticleCreationFunc"); } #ifdef AMREX_USE_GPU |