Use WARPX_ABORT_WITH_MESSAGE("msg") instead of amrex::Abort(Utils::TextMsg::Err("msg")) (#3879)

* use WARPX_ABORT_WITH_MSG instead of amrex::Abort(Utils::TextMsg::Err(msg)) [WIP]

* use WARPX_ABORT_WITH_MESSAGE

* fix typo

* fix missing parenthesis

* remove spaces to prevent automatic text wrapping

* remove wrong parenthesis

11 files changed, 27 insertions, 27 deletions

diff --git a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
index 2725e4310..7f4016450 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/ComputeDivE.cpp
@@ -65,7 +65,7 @@ void FiniteDifferenceSolver::ComputeDivE (
 
 #endif
     } else {
-        amrex::Abort(Utils::TextMsg::Err("ComputeDivE: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE("ComputeDivE: Unknown algorithm");
     }
 
 }
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
index b53f0780c..a439a91f7 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp
@@ -93,7 +93,7 @@ void FiniteDifferenceSolver::EvolveB (
 #endif
 #endif
     } else {
-        amrex::Abort(Utils::TextMsg::Err("EvolveB: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE("EvolveB: Unknown algorithm");
     }
 }
 
@@ -212,8 +212,8 @@ void FiniteDifferenceSolver::EvolveBCartesianECT (
 #ifdef AMREX_USE_EB
 
 #if !(defined(WARPX_DIM_3D) || defined(WARPX_DIM_XZ))
-    amrex::Abort(Utils::TextMsg::Err(
-        "EvolveBCartesianECT: Embedded Boundaries are only implemented in 2D3V and 3D3V"));
+    WARPX_ABORT_WITH_MESSAGE(
+        "EvolveBCartesianECT: Embedded Boundaries are only implemented in 2D3V and 3D3V");
 #endif
 
     amrex::LayoutData<amrex::Real> *cost = WarpX::getCosts(lev);
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
index ba0d7c9ce..9ae67d4f9 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveBPML.cpp
@@ -50,8 +50,8 @@ void FiniteDifferenceSolver::EvolveBPML (
    // but we compile code for each algorithm, using templates)
 #ifdef WARPX_DIM_RZ
     amrex::ignore_unused(Bfield, Efield, dt, dive_cleaning);
-    amrex::Abort(Utils::TextMsg::Err(
-        "PML are not implemented in cylindrical geometry."));
+   WARPX_ABORT_WITH_MESSAGE(
+        "PML are not implemented in cylindrical geometry.");
 #else
     if (m_grid_type == GridType::Collocated) {
 
@@ -66,8 +66,8 @@ void FiniteDifferenceSolver::EvolveBPML (
         EvolveBPMLCartesian <CartesianCKCAlgorithm> (Bfield, Efield, dt, dive_cleaning);
 
     } else {
-        amrex::Abort(Utils::TextMsg::Err(
-            "EvolveBPML: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE(
+            "EvolveBPML: Unknown algorithm");
     }
 #endif
 }
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
index d37e5f744..3ea6bc8db 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveE.cpp
@@ -84,7 +84,7 @@ void FiniteDifferenceSolver::EvolveE (
 
 #endif
     } else {
-        amrex::Abort(Utils::TextMsg::Err("EvolveE: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE("EvolveE: Unknown algorithm");
     }
 
 }
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveECTRho.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveECTRho.cpp
index 0ef5571a1..a155b8f71 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveECTRho.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveECTRho.cpp
@@ -74,8 +74,8 @@ void FiniteDifferenceSolver::EvolveRhoCartesianECT (
 #ifdef AMREX_USE_EB
 
 #if !(defined(WARPX_DIM_3D) || defined(WARPX_DIM_XZ))
-    amrex::Abort(Utils::TextMsg::Err(
-        "EvolveRhoCartesianECT: Embedded Boundaries are only implemented in 3D and XZ"));
+    WARPX_ABORT_WITH_MESSAGE(
+        "EvolveRhoCartesianECT: Embedded Boundaries are only implemented in 3D and XZ");
 #endif
 
     amrex::LayoutData<amrex::Real>* cost = WarpX::getCosts(lev);
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
index d3475b0c9..2ecc9ee0e 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveEPML.cpp
@@ -56,8 +56,8 @@ void FiniteDifferenceSolver::EvolveEPML (
    // but we compile code for each algorithm, using templates)
 #ifdef WARPX_DIM_RZ
     amrex::ignore_unused(Efield, Bfield, Jfield, Ffield, sigba, dt, pml_has_particles, edge_lengths);
-    amrex::Abort(Utils::TextMsg::Err(
-        "PML are not implemented in cylindrical geometry."));
+    WARPX_ABORT_WITH_MESSAGE(
+        "PML are not implemented in cylindrical geometry.");
 #else
     if (m_grid_type == GridType::Collocated) {
 
@@ -75,7 +75,7 @@ void FiniteDifferenceSolver::EvolveEPML (
             Efield, Bfield, Jfield,  edge_lengths, Ffield, sigba, dt, pml_has_particles );
 
     } else {
-        amrex::Abort(Utils::TextMsg::Err("EvolveEPML: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE("EvolveEPML: Unknown algorithm");
     }
 #endif
 }
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
index 171967b81..c43d965b3 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveF.cpp
@@ -72,7 +72,7 @@ void FiniteDifferenceSolver::EvolveF (
 
 #endif
     } else {
-        amrex::Abort(Utils::TextMsg::Err("EvolveF: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE("EvolveF: Unknown algorithm");
     }
 
 }
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
index 1cb5201cd..5b69737c7 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveFPML.cpp
@@ -48,8 +48,8 @@ void FiniteDifferenceSolver::EvolveFPML (
    // but we compile code for each algorithm, using templates)
 #ifdef WARPX_DIM_RZ
     amrex::ignore_unused(Ffield, Efield, dt);
-    amrex::Abort(Utils::TextMsg::Err(
-        "PML are not implemented in cylindrical geometry."));
+    WARPX_ABORT_WITH_MESSAGE(
+        "PML are not implemented in cylindrical geometry.");
 #else
     if (m_grid_type == GridType::Collocated) {
 
@@ -64,7 +64,7 @@ void FiniteDifferenceSolver::EvolveFPML (
         EvolveFPMLCartesian <CartesianCKCAlgorithm> ( Ffield, Efield, dt );
 
     } else {
-        amrex::Abort(Utils::TextMsg::Err("EvolveFPML: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE("EvolveFPML: Unknown algorithm");
     }
 #endif
 }
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
index c31929258..30d19efe0 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveG.cpp
@@ -61,7 +61,7 @@ void FiniteDifferenceSolver::EvolveG (
     }
     else
     {
-        amrex::Abort(Utils::TextMsg::Err("EvolveG: unknown FDTD algorithm"));
+        WARPX_ABORT_WITH_MESSAGE("EvolveG: unknown FDTD algorithm");
     }
 #endif
 }
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
index a65d86b8f..26da8352c 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/FiniteDifferenceSolver.cpp
@@ -58,8 +58,8 @@ FiniteDifferenceSolver::FiniteDifferenceSolver (
                               m_stencil_coefs_z.begin());
         amrex::Gpu::synchronize();
     } else {
-        amrex::Abort(Utils::TextMsg::Err(
-            "FiniteDifferenceSolver: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE(
+            "FiniteDifferenceSolver: Unknown algorithm");
     }
 #else
     if (grid_type == GridType::Collocated) {
@@ -78,8 +78,8 @@ FiniteDifferenceSolver::FiniteDifferenceSolver (
             m_h_stencil_coefs_x, m_h_stencil_coefs_y, m_h_stencil_coefs_z );
 
     } else {
-        amrex::Abort(Utils::TextMsg::Err(
-            "FiniteDifferenceSolver: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE(
+            "FiniteDifferenceSolver: Unknown algorithm");
     }
 
     m_stencil_coefs_x.resize(m_h_stencil_coefs_x.size());
diff --git a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
index 487ab0652..ffa9fbfc8 100644
--- a/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
+++ b/Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
@@ -47,8 +47,8 @@ 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(Utils::TextMsg::Err(
-        "currently macro E-push does not work for RZ"));
+
+    WARPX_ABORT_WITH_MESSAGE("currently macro E-push does not work for RZ");
 #else
     WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
         m_grid_type != GridType::Collocated, "Macroscopic E field solver does not work on collocated grids");
@@ -86,8 +86,8 @@ void FiniteDifferenceSolver::MacroscopicEvolveE (
         }
 
     } else {
-        amrex::Abort(Utils::TextMsg::Err(
-            "MacroscopicEvolveE: Unknown algorithm"));
+        WARPX_ABORT_WITH_MESSAGE(
+            "MacroscopicEvolveE: Unknown algorithm");
     }
 #endif