diff options
Diffstat (limited to 'Source/FieldSolver')
22 files changed, 70 insertions, 70 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 diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp index aecc754d4..13eb1bbf3 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp @@ -502,8 +502,8 @@ void PsatdAlgorithmComoving::CurrentCorrection (SpectralFieldData& field_data) void PsatdAlgorithmComoving::VayDeposition (SpectralFieldData& /*field_data*/) { - amrex::Abort(Utils::TextMsg::Err( - "Vay deposition not implemented for comoving PSATD")); + WARPX_ABORT_WITH_MESSAGE( + "Vay deposition not implemented for comoving PSATD"); } #endif // WARPX_USE_PSATD diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp index 3701fb889..290b005e1 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmFirstOrder.cpp @@ -357,8 +357,8 @@ void PsatdAlgorithmFirstOrder::CurrentCorrection (SpectralFieldData& field_data) BL_PROFILE("PsatdAlgorithmFirstOrder::CurrentCorrection"); amrex::ignore_unused(field_data); - amrex::Abort(Utils::TextMsg::Err( - "Current correction not implemented for first-order PSATD equations")); + WARPX_ABORT_WITH_MESSAGE( + "Current correction not implemented for first-order PSATD equations"); } void @@ -368,8 +368,8 @@ PsatdAlgorithmFirstOrder::VayDeposition (SpectralFieldData& field_data) BL_PROFILE("PsatdAlgorithmFirstOrder::VayDeposition()"); amrex::ignore_unused(field_data); - amrex::Abort(Utils::TextMsg::Err( - "Vay deposition not implemented for first-order PSATD equations")); + WARPX_ABORT_WITH_MESSAGE( + "Vay deposition not implemented for first-order PSATD equations"); } #endif // WARPX_USE_PSATD diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmGalileanRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmGalileanRZ.cpp index 75f0e49d1..8ab311308 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmGalileanRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmGalileanRZ.cpp @@ -364,6 +364,6 @@ PsatdAlgorithmGalileanRZ::CurrentCorrection (SpectralFieldDataRZ& field_data) void PsatdAlgorithmGalileanRZ::VayDeposition (SpectralFieldDataRZ& /*field_data*/) { - amrex::Abort(Utils::TextMsg::Err( - "Vay deposition not implemented in RZ geometry")); + WARPX_ABORT_WITH_MESSAGE( + "Vay deposition not implemented in RZ geometry"); } diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp index ecdd6169c..27db744d7 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp @@ -430,8 +430,8 @@ void PsatdAlgorithmJLinearInTime::CurrentCorrection (SpectralFieldData& field_da BL_PROFILE("PsatdAlgorithmJLinearInTime::CurrentCorrection"); amrex::ignore_unused(field_data); - amrex::Abort(Utils::TextMsg::Err( - "Current correction not implemented for multi-J PSATD algorithm")); + WARPX_ABORT_WITH_MESSAGE( + "Current correction not implemented for multi-J PSATD algorithm"); } void @@ -441,8 +441,8 @@ PsatdAlgorithmJLinearInTime::VayDeposition (SpectralFieldData& field_data) BL_PROFILE("PsatdAlgorithmJLinearInTime::VayDeposition()"); amrex::ignore_unused(field_data); - amrex::Abort(Utils::TextMsg::Err( - "Vay deposition not implemented for multi-J PSATD algorithm")); + WARPX_ABORT_WITH_MESSAGE( + "Vay deposition not implemented for multi-J PSATD algorithm"); } #endif // WARPX_USE_PSATD diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp index 217998d18..b8bdfdbed 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp @@ -405,15 +405,15 @@ void PsatdAlgorithmPml::InitializeSpectralCoefficients ( void PsatdAlgorithmPml::CurrentCorrection (SpectralFieldData& /*field_data*/) { - amrex::Abort(Utils::TextMsg::Err( - "Current correction not implemented for PML PSATD")); + WARPX_ABORT_WITH_MESSAGE( + "Current correction not implemented for PML PSATD"); } void PsatdAlgorithmPml::VayDeposition (SpectralFieldData& /*field_data*/) { - amrex::Abort(Utils::TextMsg::Err( - "Vay deposition not implemented for PML PSATD")); + WARPX_ABORT_WITH_MESSAGE( + "Vay deposition not implemented for PML PSATD"); } #endif // WARPX_USE_PSATD diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPmlRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPmlRZ.cpp index 60f7209de..d2200eb9f 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPmlRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPmlRZ.cpp @@ -163,13 +163,13 @@ void PsatdAlgorithmPmlRZ::InitializeSpectralCoefficients (SpectralFieldDataRZ co void PsatdAlgorithmPmlRZ::CurrentCorrection (SpectralFieldDataRZ& /* field_data */) { - amrex::Abort(Utils::TextMsg::Err( - "Current correction not implemented in RZ geometry PML")); + WARPX_ABORT_WITH_MESSAGE( + "Current correction not implemented in RZ geometry PML"); } void PsatdAlgorithmPmlRZ::VayDeposition (SpectralFieldDataRZ& /*field_data*/) { - amrex::Abort(Utils::TextMsg::Err( - "Vay deposition not implemented in RZ geometry PML")); + WARPX_ABORT_WITH_MESSAGE( + "Vay deposition not implemented in RZ geometry PML"); } diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp index 5b024b425..ee83ddce7 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmRZ.cpp @@ -58,20 +58,20 @@ PsatdAlgorithmRZ::PsatdAlgorithmRZ (SpectralKSpaceRZ const & spectral_kspace, if (time_averaging && J_in_time != JInTime::Linear) { - amrex::Abort(Utils::TextMsg::Err( - "RZ PSATD: psatd.do_time_averaging=1 implemented only with psatd.J_in_time=linear")); + WARPX_ABORT_WITH_MESSAGE( + "RZ PSATD: psatd.do_time_averaging=1 implemented only with psatd.J_in_time=linear"); } if (dive_cleaning && J_in_time != JInTime::Linear) { - amrex::Abort(Utils::TextMsg::Err( - "RZ PSATD: warpx.do_dive_cleaning=1 implemented only with psatd.J_in_time=linear")); + WARPX_ABORT_WITH_MESSAGE( + "RZ PSATD: warpx.do_dive_cleaning=1 implemented only with psatd.J_in_time=linear"); } if (divb_cleaning && J_in_time != JInTime::Linear) { - amrex::Abort(Utils::TextMsg::Err( - "RZ PSATD: warpx.do_divb_cleaning=1 implemented only with psatd.J_in_time=linear")); + WARPX_ABORT_WITH_MESSAGE( + "RZ PSATD: warpx.do_divb_cleaning=1 implemented only with psatd.J_in_time=linear"); } } @@ -491,6 +491,6 @@ PsatdAlgorithmRZ::CurrentCorrection (SpectralFieldDataRZ& field_data) void PsatdAlgorithmRZ::VayDeposition (SpectralFieldDataRZ& /*field_data*/) { - amrex::Abort(Utils::TextMsg::Err( - "Vay deposition not implemented in RZ geometry")); + WARPX_ABORT_WITH_MESSAGE( + "Vay deposition not implemented in RZ geometry"); } diff --git a/Source/FieldSolver/SpectralSolver/WrapCuFFT.cpp b/Source/FieldSolver/SpectralSolver/WrapCuFFT.cpp index 030efcd4b..59b200a32 100644 --- a/Source/FieldSolver/SpectralSolver/WrapCuFFT.cpp +++ b/Source/FieldSolver/SpectralSolver/WrapCuFFT.cpp @@ -37,7 +37,7 @@ namespace AnyFFT result = cufftPlan2d( &(fft_plan.m_plan), real_size[1], real_size[0], VendorR2C); } else { - amrex::Abort(Utils::TextMsg::Err("only dim=2 and dim=3 have been implemented")); + WARPX_ABORT_WITH_MESSAGE("only dim=2 and dim=3 have been implemented"); } } else { if (dim == 3) { @@ -47,7 +47,7 @@ namespace AnyFFT result = cufftPlan2d( &(fft_plan.m_plan), real_size[1], real_size[0], VendorC2R); } else { - amrex::Abort(Utils::TextMsg::Err("only dim=2 and dim=3 have been implemented")); + WARPX_ABORT_WITH_MESSAGE("only dim=2 and dim=3 have been implemented"); } } @@ -89,11 +89,11 @@ namespace AnyFFT result = cufftExecZ2D(fft_plan.m_plan, fft_plan.m_complex_array, fft_plan.m_real_array); #endif } else { - amrex::Abort(Utils::TextMsg::Err( - "direction must be AnyFFT::direction::R2C or AnyFFT::direction::C2R")); + WARPX_ABORT_WITH_MESSAGE( + "direction must be AnyFFT::direction::R2C or AnyFFT::direction::C2R"); } if ( result != CUFFT_SUCCESS ) { - amrex::Print() << Utils::TextMsg::Err( + WARPX_ABORT_WITH_MESSAGE( "forward transform using cufftExec failed ! Error: " +cufftErrorToString(result)); } diff --git a/Source/FieldSolver/SpectralSolver/WrapFFTW.cpp b/Source/FieldSolver/SpectralSolver/WrapFFTW.cpp index 8159e53c3..df330c4f6 100644 --- a/Source/FieldSolver/SpectralSolver/WrapFFTW.cpp +++ b/Source/FieldSolver/SpectralSolver/WrapFFTW.cpp @@ -54,8 +54,8 @@ namespace AnyFFT fft_plan.m_plan = VendorCreatePlanR2C2D( real_size[1], real_size[0], real_array, complex_array, FFTW_ESTIMATE); } else { - amrex::Abort(Utils::TextMsg::Err( - "only dim=2 and dim=3 have been implemented")); + WARPX_ABORT_WITH_MESSAGE( + "only dim=2 and dim=3 have been implemented"); } } else if (dir == direction::C2R){ if (dim == 3) { @@ -65,8 +65,8 @@ namespace AnyFFT fft_plan.m_plan = VendorCreatePlanC2R2D( real_size[1], real_size[0], complex_array, real_array, FFTW_ESTIMATE); } else { - amrex::Abort(Utils::TextMsg::Err( - "only dim=2 and dim=3 have been implemented. Should be easy to add dim=1.")); + WARPX_ABORT_WITH_MESSAGE( + "only dim=2 and dim=3 have been implemented. Should be easy to add dim=1."); } } diff --git a/Source/FieldSolver/SpectralSolver/WrapRocFFT.cpp b/Source/FieldSolver/SpectralSolver/WrapRocFFT.cpp index 66c9c6c50..0d8246c09 100644 --- a/Source/FieldSolver/SpectralSolver/WrapRocFFT.cpp +++ b/Source/FieldSolver/SpectralSolver/WrapRocFFT.cpp @@ -18,8 +18,8 @@ namespace AnyFFT void assert_rocfft_status (std::string const& name, rocfft_status status) { if (status != rocfft_status_success) { - amrex::Abort(Utils::TextMsg::Err( - name + " failed! Error: " + rocfftErrorToString(status))); + WARPX_ABORT_WITH_MESSAGE( + name + " failed! Error: " + rocfftErrorToString(status)); } } } @@ -91,8 +91,8 @@ namespace AnyFFT (void**)&(fft_plan.m_real_array), // out execinfo); } else { - amrex::Abort(Utils::TextMsg::Err( - "direction must be AnyFFT::direction::R2C or AnyFFT::direction::C2R")); + WARPX_ABORT_WITH_MESSAGE( + "direction must be AnyFFT::direction::R2C or AnyFFT::direction::C2R"); } assert_rocfft_status("rocfft_execute", result); diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp index f633422b2..793a8cd24 100644 --- a/Source/FieldSolver/WarpXPushFieldsEM.cpp +++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp @@ -649,8 +649,8 @@ void WarpX::PushPSATD () { #ifndef WARPX_USE_PSATD - amrex::Abort(Utils::TextMsg::Err( - "PushFieldsEM: PSATD solver selected but not built")); + WARPX_ABORT_WITH_MESSAGE( + "PushFieldsEM: PSATD solver selected but not built"); #else const int rho_old = spectral_solver_fp[0]->m_spectral_index.rho_old; |