diff options
Diffstat (limited to 'Source/FieldSolver')
5 files changed, 45 insertions, 29 deletions
diff --git a/Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridSpectralSolver.cpp b/Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridSpectralSolver.cpp index cb6b7794f..978129cf2 100644 --- a/Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridSpectralSolver.cpp +++ b/Source/FieldSolver/PicsarHybridSpectralSolver/PicsarHybridSpectralSolver.cpp @@ -376,12 +376,12 @@ WarpX::FreeFFT (int lev) void WarpX::PushPSATD_hybridFFT (int lev, amrex::Real /* dt */) { - BL_PROFILE_VAR_NS("WarpXFFT::CopyDualGrid", blp_copy); - BL_PROFILE_VAR_NS("PICSAR::FftPushEB", blp_push_eb); + WARPX_PROFILE_VAR_NS("WarpXFFT::CopyDualGrid", blp_copy); + WARPX_PROFILE_VAR_NS("PICSAR::FftPushEB", blp_push_eb); auto period_fp = geom[lev].periodicity(); - BL_PROFILE_VAR_START(blp_copy); + WARPX_PROFILE_VAR_START(blp_copy); Efield_fp_fft[lev][0]->ParallelCopy(*Efield_fp[lev][0], 0, 0, 1, Efield_fp[lev][0]->nGrow(), 0, period_fp); Efield_fp_fft[lev][1]->ParallelCopy(*Efield_fp[lev][1], 0, 0, 1, Efield_fp[lev][1]->nGrow(), 0, period_fp); Efield_fp_fft[lev][2]->ParallelCopy(*Efield_fp[lev][2], 0, 0, 1, Efield_fp[lev][2]->nGrow(), 0, period_fp); @@ -392,9 +392,9 @@ WarpX::PushPSATD_hybridFFT (int lev, amrex::Real /* dt */) current_fp_fft[lev][1]->ParallelCopy(*current_fp[lev][1], 0, 0, 1, current_fp[lev][1]->nGrow(), 0, period_fp); current_fp_fft[lev][2]->ParallelCopy(*current_fp[lev][2], 0, 0, 1, current_fp[lev][2]->nGrow(), 0, period_fp); rho_fp_fft[lev]->ParallelCopy(*rho_fp[lev], 0, 0, 2, rho_fp[lev]->nGrow(), 0, period_fp); - BL_PROFILE_VAR_STOP(blp_copy); + WARPX_PROFILE_VAR_STOP(blp_copy); - BL_PROFILE_VAR_START(blp_push_eb); + WARPX_PROFILE_VAR_START(blp_push_eb); if (Efield_fp_fft[lev][0]->local_size() == 1) //Only one FFT patch on this MPI { @@ -435,16 +435,16 @@ WarpX::PushPSATD_hybridFFT (int lev, amrex::Real /* dt */) { amrex::Abort("WarpX::PushPSATD: TODO"); } - BL_PROFILE_VAR_STOP(blp_push_eb); + WARPX_PROFILE_VAR_STOP(blp_push_eb); - BL_PROFILE_VAR_START(blp_copy); + WARPX_PROFILE_VAR_START(blp_copy); CopyDataFromFFTToValid(*Efield_fp[lev][0], *Efield_fp_fft[lev][0], ba_valid_fp_fft[lev], geom[lev]); CopyDataFromFFTToValid(*Efield_fp[lev][1], *Efield_fp_fft[lev][1], ba_valid_fp_fft[lev], geom[lev]); CopyDataFromFFTToValid(*Efield_fp[lev][2], *Efield_fp_fft[lev][2], ba_valid_fp_fft[lev], geom[lev]); CopyDataFromFFTToValid(*Bfield_fp[lev][0], *Bfield_fp_fft[lev][0], ba_valid_fp_fft[lev], geom[lev]); CopyDataFromFFTToValid(*Bfield_fp[lev][1], *Bfield_fp_fft[lev][1], ba_valid_fp_fft[lev], geom[lev]); CopyDataFromFFTToValid(*Bfield_fp[lev][2], *Bfield_fp_fft[lev][2], ba_valid_fp_fft[lev], geom[lev]); - BL_PROFILE_VAR_STOP(blp_copy); + WARPX_PROFILE_VAR_STOP(blp_copy); if (lev > 0) { diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H index 65f975682..2f6428fc6 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H +++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H @@ -40,10 +40,7 @@ class SpectralSolver * (in the spectral field specified by `field_index`) */ void ForwardTransform( const amrex::MultiFab& mf, const int field_index, - const int i_comp=0 ){ - BL_PROFILE("SpectralSolver::ForwardTransform"); - field_data.ForwardTransform( mf, field_index, i_comp ); - }; + const int i_comp=0 ); /** * \brief Transform spectral field specified by `field_index` back to @@ -51,21 +48,12 @@ class SpectralSolver */ void BackwardTransform( amrex::MultiFab& mf, const int field_index, - const int i_comp=0 ){ - BL_PROFILE("SpectralSolver::BackwardTransform"); - field_data.BackwardTransform( mf, field_index, i_comp ); - }; + const int i_comp=0 ); /** * \brief Update the fields in spectral space, over one timestep */ - void pushSpectralFields(){ - BL_PROFILE("SpectralSolver::pushSpectralFields"); - // Virtual function: the actual function used here depends - // on the sub-class of `SpectralBaseAlgorithm` that was - // initialized in the constructor of `SpectralSolver` - algorithm->pushSpectralFields( field_data ); - }; + void pushSpectralFields(); private: SpectralFieldData field_data; // Store field in spectral space diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp index c24a7af69..9df981528 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp @@ -9,7 +9,8 @@ #include <PsatdAlgorithm.H> #include <GalileanAlgorithm.H> #include <PMLPsatdAlgorithm.H> - +#include "WarpX.H" +#include "WarpXProfilerWrapper.H" /* \brief Initialize the spectral Maxwell solver * @@ -62,4 +63,31 @@ SpectralSolver::SpectralSolver( field_data = SpectralFieldData( realspace_ba, k_space, dm, algorithm->getRequiredNumberOfFields() ); -}; +} + +void +SpectralSolver::ForwardTransform( const amrex::MultiFab& mf, + const int field_index, + const int i_comp ) +{ + WARPX_PROFILE("SpectralSolver::ForwardTransform"); + field_data.ForwardTransform( mf, field_index, i_comp ); +} + +void +SpectralSolver::BackwardTransform( amrex::MultiFab& mf, + const int field_index, + const int i_comp ) +{ + WARPX_PROFILE("SpectralSolver::BackwardTransform"); + field_data.BackwardTransform( mf, field_index, i_comp ); +} + +void +SpectralSolver::pushSpectralFields(){ + WARPX_PROFILE("SpectralSolver::pushSpectralFields"); + // Virtual function: the actual function used here depends + // on the sub-class of `SpectralBaseAlgorithm` that was + // initialized in the constructor of `SpectralSolver` + algorithm->pushSpectralFields( field_data ); +} diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp index 74db3cac4..dd9a41254 100644 --- a/Source/FieldSolver/WarpXPushFieldsEM.cpp +++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp @@ -107,7 +107,7 @@ WarpX::EvolveB (amrex::Real a_dt) void WarpX::EvolveB (int lev, amrex::Real a_dt) { - BL_PROFILE("WarpX::EvolveB()"); + WARPX_PROFILE("WarpX::EvolveB()"); EvolveB(lev, PatchType::fine, a_dt); if (lev > 0) { @@ -208,7 +208,7 @@ WarpX::EvolveE (amrex::Real a_dt) void WarpX::EvolveE (int lev, amrex::Real a_dt) { - BL_PROFILE("WarpX::EvolveE()"); + WARPX_PROFILE("WarpX::EvolveE()"); EvolveE(lev, PatchType::fine, a_dt); if (lev > 0) { @@ -529,7 +529,7 @@ WarpX::EvolveF (int lev, PatchType patch_type, amrex::Real a_dt, DtType a_dt_typ { if (!do_dive_cleaning) return; - BL_PROFILE("WarpX::EvolveF()"); + WARPX_PROFILE("WarpX::EvolveF()"); static constexpr Real mu_c2 = PhysConst::mu0*PhysConst::c*PhysConst::c; diff --git a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp index ef297e351..3e1034c99 100644 --- a/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp +++ b/Source/FieldSolver/WarpX_QED_Field_Pushers.cpp @@ -48,7 +48,7 @@ WarpX::Hybrid_QED_Push (amrex::Vector<amrex::Real> dt) void WarpX::Hybrid_QED_Push (int lev, Real a_dt) { - BL_PROFILE("WarpX::Hybrid_QED_Push()"); + WARPX_PROFILE("WarpX::Hybrid_QED_Push()"); Hybrid_QED_Push(lev, PatchType::fine, a_dt); if (lev > 0) { |