From 724a0e061274d4eac5daed409933fe073899eda7 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Tue, 17 May 2022 09:58:22 +0200 Subject: Use uniform error message formatting in more source files (#2964) * use WARPX_ALWAYS_ASSERT_WITH_MESSAGE instead of Abort() * fix bug * Update Source/WarpX.cpp Co-authored-by: Axel Huebl * use more uniform text formatting * fixed bug * fixed bug * using Utils::TextMsg in more files * fixed bug * use Utils::TextMsg in more files * fixed bug * use Utils::TextMsg in more files * fixed last merge conflict * fixed bug * fix indentation Co-authored-by: Axel Huebl --- .../FiniteDifferenceSolver/MacroscopicEvolveE.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp') diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp index bc9576cfd..4b117aad3 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp @@ -9,6 +9,7 @@ #endif #include "MacroscopicProperties/MacroscopicProperties.H" #include "Utils/CoarsenIO.H" +#include "Utils/TextMsg.H" #include "Utils/WarpXAlgorithmSelection.H" #include "Utils/WarpXUtil.H" #include "WarpX.H" @@ -46,12 +47,14 @@ void FiniteDifferenceSolver::MacroscopicEvolveE ( // but we compile code for each algorithm, using templates) #ifdef WARPX_DIM_RZ amrex::ignore_unused(Efield, Bfield, Jfield, edge_lengths, dt, macroscopic_properties); - amrex::Abort("currently macro E-push does not work for RZ"); + amrex::Abort(Utils::TextMsg::Err( + "currently macro E-push does not work for RZ")); #else - if (m_do_nodal) { - amrex::Abort(" macro E-push does not work for nodal "); + WARPX_ALWAYS_ASSERT_WITH_MESSAGE( + !m_do_nodal, "macro E-push does not work for nodal"); - } else if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { + + if (m_fdtd_algo == MaxwellSolverAlgo::Yee) { if (WarpX::macroscopic_solver_algo == MacroscopicSolverAlgo::LaxWendroff) { @@ -83,7 +86,8 @@ void FiniteDifferenceSolver::MacroscopicEvolveE ( } } else { - amrex::Abort("MacroscopicEvolveE: Unknown algorithm"); + amrex::Abort(Utils::TextMsg::Err( + "MacroscopicEvolveE: Unknown algorithm")); } #endif -- cgit v1.2.3