diff options
Diffstat (limited to 'Source/Particles/ElementaryProcess')
6 files changed, 12 insertions, 23 deletions
diff --git a/Source/Particles/ElementaryProcess/Ionization.H b/Source/Particles/ElementaryProcess/Ionization.H index eeac927a9..9bf85ddf7 100644 --- a/Source/Particles/ElementaryProcess/Ionization.H +++ b/Source/Particles/ElementaryProcess/Ionization.H @@ -70,7 +70,6 @@ struct IonizationFilterFunc amrex::FArrayBox const& bxfab, amrex::FArrayBox const& byfab, amrex::FArrayBox const& bzfab, - amrex::Vector<amrex::Real> v_galilean, const amrex::Real* const AMREX_RESTRICT a_ionization_energies, const amrex::Real* const AMREX_RESTRICT a_adk_prefactor, const amrex::Real* const AMREX_RESTRICT a_adk_exp_prefactor, diff --git a/Source/Particles/ElementaryProcess/Ionization.cpp b/Source/Particles/ElementaryProcess/Ionization.cpp index 5264faf93..a4aac9d5e 100644 --- a/Source/Particles/ElementaryProcess/Ionization.cpp +++ b/Source/Particles/ElementaryProcess/Ionization.cpp @@ -24,7 +24,6 @@ IonizationFilterFunc::IonizationFilterFunc (const WarpXParIter& a_pti, int lev, amrex::FArrayBox const& bxfab, amrex::FArrayBox const& byfab, amrex::FArrayBox const& bzfab, - amrex::Vector<amrex::Real> v_galilean, const amrex::Real* const AMREX_RESTRICT a_ionization_energies, const amrex::Real* const AMREX_RESTRICT a_adk_prefactor, const amrex::Real* const AMREX_RESTRICT a_adk_exp_prefactor, @@ -33,6 +32,9 @@ IonizationFilterFunc::IonizationFilterFunc (const WarpXParIter& a_pti, int lev, int a_atomic_number, int a_offset) noexcept { + + using namespace amrex::literals; + m_ionization_energies = a_ionization_energies; m_adk_prefactor = a_adk_prefactor; m_adk_exp_prefactor = a_adk_exp_prefactor; @@ -64,11 +66,7 @@ IonizationFilterFunc::IonizationFilterFunc (const WarpXParIter& a_pti, int lev, m_dx_arr = {dx[0], dx[1], dx[2]}; // Lower corner of tile box physical domain (take into account Galilean shift) - amrex::Real cur_time = WarpX::GetInstance().gett_new(lev); - const auto& time_of_last_gal_shift = WarpX::GetInstance().time_of_last_gal_shift; - amrex::Real time_shift = (cur_time - time_of_last_gal_shift); - amrex::Array<amrex::Real,3> galilean_shift = { v_galilean[0]*time_shift, v_galilean[1]*time_shift, v_galilean[2]*time_shift }; - const std::array<amrex::Real, 3>& xyzmin = WarpX::LowerCorner(box, galilean_shift, lev); + const std::array<amrex::Real, 3>& xyzmin = WarpX::LowerCorner(box, lev, 0._rt); m_xyzmin_arr = {xyzmin[0], xyzmin[1], xyzmin[2]}; m_galerkin_interpolation = WarpX::galerkin_interpolation; diff --git a/Source/Particles/ElementaryProcess/QEDPairGeneration.H b/Source/Particles/ElementaryProcess/QEDPairGeneration.H index a125ccc8b..a38d0754a 100644 --- a/Source/Particles/ElementaryProcess/QEDPairGeneration.H +++ b/Source/Particles/ElementaryProcess/QEDPairGeneration.H @@ -94,7 +94,6 @@ public: * @param[in] bxfab constant reference to the FArrayBox of the x component of the magnetic field * @param[in] byfab constant reference to the FArrayBox of the y component of the magnetic field * @param[in] bzfab constant reference to the FArrayBox of the z component of the magnetic field - * @param[in] v_galilean vector components of the Galilean velocity (used with the Galilean PSATD solver) * @param[in] a_offset offset to apply to the particle indices */ PairGenerationTransformFunc(BreitWheelerGeneratePairs const generate_functor, @@ -105,7 +104,6 @@ public: amrex::FArrayBox const& bxfab, amrex::FArrayBox const& byfab, amrex::FArrayBox const& bzfab, - amrex::Vector<amrex::Real> v_galilean, int a_offset = 0); /** diff --git a/Source/Particles/ElementaryProcess/QEDPairGeneration.cpp b/Source/Particles/ElementaryProcess/QEDPairGeneration.cpp index 52134ca81..68475aa14 100644 --- a/Source/Particles/ElementaryProcess/QEDPairGeneration.cpp +++ b/Source/Particles/ElementaryProcess/QEDPairGeneration.cpp @@ -26,10 +26,12 @@ PairGenerationTransformFunc (BreitWheelerGeneratePairs const generate_functor, amrex::FArrayBox const& bxfab, amrex::FArrayBox const& byfab, amrex::FArrayBox const& bzfab, - amrex::Vector<amrex::Real> v_galilean, int a_offset) : m_generate_functor(generate_functor) { + + using namespace amrex::literals; + m_get_position = GetParticlePosition(a_pti, a_offset); m_get_externalEB = GetExternalEBField(a_pti, a_offset); @@ -54,11 +56,7 @@ PairGenerationTransformFunc (BreitWheelerGeneratePairs const generate_functor, m_dx_arr = {dx[0], dx[1], dx[2]}; // Lower corner of tile box physical domain (take into account Galilean shift) - amrex::Real cur_time = WarpX::GetInstance().gett_new(lev); - const auto& time_of_last_gal_shift = WarpX::GetInstance().time_of_last_gal_shift; - amrex::Real time_shift = (cur_time - time_of_last_gal_shift); - amrex::Array<amrex::Real,3> galilean_shift = { v_galilean[0]*time_shift, v_galilean[1]*time_shift, v_galilean[2]*time_shift }; - const std::array<amrex::Real, 3>& xyzmin = WarpX::LowerCorner(box, galilean_shift, lev); + const std::array<amrex::Real, 3>& xyzmin = WarpX::LowerCorner(box, lev, 0._rt); m_xyzmin_arr = {xyzmin[0], xyzmin[1], xyzmin[2]}; m_galerkin_interpolation = WarpX::galerkin_interpolation; diff --git a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H index 21cd34730..93aea3c3b 100644 --- a/Source/Particles/ElementaryProcess/QEDPhotonEmission.H +++ b/Source/Particles/ElementaryProcess/QEDPhotonEmission.H @@ -105,7 +105,6 @@ public: * @param[in] bxfab constant reference to the FArrayBox of the x component of the magnetic field * @param[in] byfab constant reference to the FArrayBox of the y component of the magnetic field * @param[in] bzfab constant reference to the FArrayBox of the z component of the magnetic field - * @param[in] v_galilean vector components of the Galilean velocity (used with the Galilean PSATD solver) * @param[in] a_offset offset to apply to the particle indices */ PhotonEmissionTransformFunc ( @@ -119,7 +118,6 @@ public: amrex::FArrayBox const& bxfab, amrex::FArrayBox const& byfab, amrex::FArrayBox const& bzfab, - amrex::Vector<amrex::Real> v_galilean, int a_offset = 0); /** diff --git a/Source/Particles/ElementaryProcess/QEDPhotonEmission.cpp b/Source/Particles/ElementaryProcess/QEDPhotonEmission.cpp index 368a4ee96..2c060a30f 100644 --- a/Source/Particles/ElementaryProcess/QEDPhotonEmission.cpp +++ b/Source/Particles/ElementaryProcess/QEDPhotonEmission.cpp @@ -27,12 +27,14 @@ PhotonEmissionTransformFunc (QuantumSynchrotronGetOpticalDepth opt_depth_functor amrex::FArrayBox const& bxfab, amrex::FArrayBox const& byfab, amrex::FArrayBox const& bzfab, - amrex::Vector<amrex::Real> v_galilean, int a_offset) :m_opt_depth_functor{opt_depth_functor}, m_opt_depth_runtime_comp{opt_depth_runtime_comp}, m_emission_functor{emission_functor} { + + using namespace amrex::literals; + m_get_position = GetParticlePosition(a_pti, a_offset); m_get_externalEB = GetExternalEBField(a_pti, a_offset); @@ -57,11 +59,7 @@ PhotonEmissionTransformFunc (QuantumSynchrotronGetOpticalDepth opt_depth_functor m_dx_arr = {dx[0], dx[1], dx[2]}; // Lower corner of tile box physical domain (take into account Galilean shift) - amrex::Real cur_time = WarpX::GetInstance().gett_new(lev); - const auto& time_of_last_gal_shift = WarpX::GetInstance().time_of_last_gal_shift; - amrex::Real time_shift = (cur_time - time_of_last_gal_shift); - amrex::Array<amrex::Real,3> galilean_shift = { v_galilean[0]*time_shift, v_galilean[1]*time_shift, v_galilean[2]*time_shift }; - const std::array<amrex::Real, 3>& xyzmin = WarpX::LowerCorner(box, galilean_shift, lev); + const std::array<amrex::Real, 3>& xyzmin = WarpX::LowerCorner(box, lev, 0._rt); m_xyzmin_arr = {xyzmin[0], xyzmin[1], xyzmin[2]}; m_galerkin_interpolation = WarpX::galerkin_interpolation; |