diff options
Diffstat (limited to 'Source/Parallelization')
| -rw-r--r-- | Source/Parallelization/GuardCellManager.cpp | 3 | ||||
| -rw-r--r-- | Source/Parallelization/KernelTimer.H | 1 | ||||
| -rw-r--r-- | Source/Parallelization/WarpXComm.cpp | 15 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Source/Parallelization/GuardCellManager.cpp b/Source/Parallelization/GuardCellManager.cpp index d09e46951..cfe2c0e4d 100644 --- a/Source/Parallelization/GuardCellManager.cpp +++ b/Source/Parallelization/GuardCellManager.cpp @@ -15,6 +15,7 @@ # include "FieldSolver/FiniteDifferenceSolver/FiniteDifferenceAlgorithms/CylindricalYeeAlgorithm.H" #endif #include "Filter/NCIGodfreyFilter.H" +#include "Utils/TextMsg.H" #include "Utils/WarpXAlgorithmSelection.H" #include "Utils/WarpXConst.H" #include "Utils/WarpXUtil.H" @@ -99,7 +100,7 @@ guardCellManager::Init ( // the fine grid by a number of cells equal to the ref_ratio in the moving // window direction. if (do_moving_window) { - AMREX_ALWAYS_ASSERT_WITH_MESSAGE(ref_ratios.size() <= 1, + WARPX_ALWAYS_ASSERT_WITH_MESSAGE(ref_ratios.size() <= 1, "The number of grow cells for the moving window currently assumes 2 levels max."); const int nlevs = ref_ratios.size()+1; int max_r = (nlevs > 1) ? ref_ratios[0][moving_window_dir] : 2; diff --git a/Source/Parallelization/KernelTimer.H b/Source/Parallelization/KernelTimer.H index 137bbb99d..3a5c8bada 100644 --- a/Source/Parallelization/KernelTimer.H +++ b/Source/Parallelization/KernelTimer.H @@ -7,6 +7,7 @@ #ifndef KERNELTIMER_H_ #define KERNELTIMER_H_ +#include "Utils/TextMsg.H" #include "WarpX.H" #include <AMReX.H> diff --git a/Source/Parallelization/WarpXComm.cpp b/Source/Parallelization/WarpXComm.cpp index 1c8988811..9c6d3e9a4 100644 --- a/Source/Parallelization/WarpXComm.cpp +++ b/Source/Parallelization/WarpXComm.cpp @@ -15,6 +15,7 @@ #include "Filter/BilinearFilter.H" #include "Utils/CoarsenMR.H" #include "Utils/IntervalsParser.H" +#include "Utils/TextMsg.H" #include "Utils/WarpXAlgorithmSelection.H" #include "Utils/WarpXProfilerWrapper.H" #include "WarpXComm_K.H" @@ -65,7 +66,7 @@ WarpX::UpdateAuxilaryDataStagToNodal () { #ifndef WARPX_USE_PSATD if (maxwell_solver_id == MaxwellSolverAlgo::PSATD) { - AMREX_ALWAYS_ASSERT_WITH_MESSAGE( false, + WARPX_ALWAYS_ASSERT_WITH_MESSAGE( false, "WarpX::UpdateAuxilaryDataStagToNodal: PSATD solver requires " "WarpX build with spectral solver support."); } @@ -587,7 +588,7 @@ WarpX::FillBoundaryE (const int lev, const PatchType patch_type, const amrex::In // Fill guard cells in valid domain for (int i = 0; i < 3; ++i) { - AMREX_ALWAYS_ASSERT_WITH_MESSAGE( + WARPX_ALWAYS_ASSERT_WITH_MESSAGE( ng <= mf[i]->nGrowVect(), "Error: in FillBoundaryE, requested more guard cells than allocated"); @@ -644,7 +645,7 @@ WarpX::FillBoundaryB (const int lev, const PatchType patch_type, const amrex::In // Fill guard cells in valid domain for (int i = 0; i < 3; ++i) { - AMREX_ALWAYS_ASSERT_WITH_MESSAGE( + WARPX_ALWAYS_ASSERT_WITH_MESSAGE( ng <= mf[i]->nGrowVect(), "Error: in FillBoundaryB, requested more guard cells than allocated"); @@ -675,7 +676,7 @@ WarpX::FillBoundaryE_avg (int lev, PatchType patch_type, IntVect ng) Vector<MultiFab*> mf{Efield_avg_fp[lev][0].get(),Efield_avg_fp[lev][1].get(),Efield_avg_fp[lev][2].get()}; WarpXCommUtil::FillBoundary(mf, period); } else { - AMREX_ALWAYS_ASSERT_WITH_MESSAGE( + WARPX_ALWAYS_ASSERT_WITH_MESSAGE( ng <= Efield_avg_fp[lev][0]->nGrowVect(), "Error: in FillBoundaryE_avg, requested more guard cells than allocated"); WarpXCommUtil::FillBoundary(*Efield_avg_fp[lev][0], ng, period); @@ -696,7 +697,7 @@ WarpX::FillBoundaryE_avg (int lev, PatchType patch_type, IntVect ng) WarpXCommUtil::FillBoundary(mf, cperiod); } else { - AMREX_ALWAYS_ASSERT_WITH_MESSAGE( + WARPX_ALWAYS_ASSERT_WITH_MESSAGE( ng <= Efield_avg_cp[lev][0]->nGrowVect(), "Error: in FillBoundaryE, requested more guard cells than allocated"); WarpXCommUtil::FillBoundary(*Efield_avg_cp[lev][0], ng, cperiod); @@ -728,7 +729,7 @@ WarpX::FillBoundaryB_avg (int lev, PatchType patch_type, IntVect ng) Vector<MultiFab*> mf{Bfield_avg_fp[lev][0].get(),Bfield_avg_fp[lev][1].get(),Bfield_avg_fp[lev][2].get()}; WarpXCommUtil::FillBoundary(mf, period); } else { - AMREX_ALWAYS_ASSERT_WITH_MESSAGE( + WARPX_ALWAYS_ASSERT_WITH_MESSAGE( ng <= Bfield_fp[lev][0]->nGrowVect(), "Error: in FillBoundaryB, requested more guard cells than allocated"); WarpXCommUtil::FillBoundary(*Bfield_avg_fp[lev][0], ng, period); @@ -748,7 +749,7 @@ WarpX::FillBoundaryB_avg (int lev, PatchType patch_type, IntVect ng) Vector<MultiFab*> mf{Bfield_avg_cp[lev][0].get(),Bfield_avg_cp[lev][1].get(),Bfield_avg_cp[lev][2].get()}; WarpXCommUtil::FillBoundary(mf, cperiod); } else { - AMREX_ALWAYS_ASSERT_WITH_MESSAGE( + WARPX_ALWAYS_ASSERT_WITH_MESSAGE( ng <= Bfield_avg_cp[lev][0]->nGrowVect(), "Error: in FillBoundaryB_avg, requested more guard cells than allocated"); WarpXCommUtil::FillBoundary(*Bfield_avg_cp[lev][0], ng, cperiod); |