diff options
Diffstat (limited to 'Source/Particles')
5 files changed, 15 insertions, 16 deletions
diff --git a/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H b/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H index 085adcc88..0868e3131 100644 --- a/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H +++ b/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H @@ -113,7 +113,7 @@ public: const amrex::ParticleReal* AMREX_RESTRICT p_pair_reaction_weight ) const { - if (n_total_pairs == 0) return amrex::Vector<int>(m_num_product_species, 0); + if (n_total_pairs == 0) return {m_num_product_species, 0}; // Compute offset array and allocate memory for the produced species amrex::Gpu::DeviceVector<index_type> offsets(n_total_pairs); @@ -297,7 +297,7 @@ public: const amrex::ParticleReal* /*p_pair_reaction_weight*/ ) const { - return amrex::Vector<int>(); + return {}; } }; diff --git a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp index 249e35f6f..12f479d32 100644 --- a/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp +++ b/Source/Particles/ElementaryProcess/QEDInternals/BreitWheelerEngineWrapper.cpp @@ -38,7 +38,7 @@ namespace pxr_sr = picsar::multi_physics::utils::serialization; BreitWheelerGetOpticalDepth BreitWheelerEngine::build_optical_depth_functor () const { - return BreitWheelerGetOpticalDepth(); + return {}; } BreitWheelerEvolveOpticalDepth @@ -46,8 +46,7 @@ BreitWheelerEngine::build_evolve_functor () const { AMREX_ALWAYS_ASSERT(m_lookup_tables_initialized); - return BreitWheelerEvolveOpticalDepth(m_dndt_table.get_view(), - m_bw_minimum_chi_phot); + return {m_dndt_table.get_view(), m_bw_minimum_chi_phot}; } BreitWheelerGeneratePairs @@ -55,7 +54,7 @@ BreitWheelerEngine::build_pair_functor () const { AMREX_ALWAYS_ASSERT(m_lookup_tables_initialized); - return BreitWheelerGeneratePairs(m_pair_prod_table.get_view()); + return {m_pair_prod_table.get_view()}; } bool BreitWheelerEngine::are_lookup_tables_initialized () const diff --git a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp index 280c1cfd4..c9bede891 100644 --- a/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp +++ b/Source/Particles/ElementaryProcess/QEDInternals/QuantumSyncEngineWrapper.cpp @@ -38,22 +38,21 @@ namespace pxr_sr = picsar::multi_physics::utils::serialization; QuantumSynchrotronGetOpticalDepth QuantumSynchrotronEngine::build_optical_depth_functor () { - return QuantumSynchrotronGetOpticalDepth(); + return {}; } QuantumSynchrotronEvolveOpticalDepth QuantumSynchrotronEngine::build_evolve_functor () { AMREX_ALWAYS_ASSERT(m_lookup_tables_initialized); - return QuantumSynchrotronEvolveOpticalDepth(m_dndt_table.get_view(), - m_qs_minimum_chi_part); + return {m_dndt_table.get_view(), m_qs_minimum_chi_part}; } QuantumSynchrotronPhotonEmission QuantumSynchrotronEngine::build_phot_em_functor () { AMREX_ALWAYS_ASSERT(m_lookup_tables_initialized); - return QuantumSynchrotronPhotonEmission(m_phot_em_table.get_view()); + return {m_phot_em_table.get_view()}; } diff --git a/Source/Particles/NamedComponentParticleContainer.H b/Source/Particles/NamedComponentParticleContainer.H index 7b2ac6f63..5cf1c06b6 100644 --- a/Source/Particles/NamedComponentParticleContainer.H +++ b/Source/Particles/NamedComponentParticleContainer.H @@ -15,6 +15,7 @@ #include <map> #include <string> +#include <utility> /** Particle Attributes stored in amrex::ParticleContainer's struct of array */ @@ -89,10 +90,10 @@ public: std::map<std::string, int> p_rcomps, std::map<std::string, int> p_ricomps) : amrex::ParticleContainer<0,0,PIdx::nattribs,0,T_Allocator>(std::move(pc)), - particle_comps(p_comps), - particle_icomps(p_icomps), - particle_runtime_comps(p_rcomps), - particle_runtime_icomps(p_ricomps) {} + particle_comps(std::move(p_comps)), + particle_icomps(std::move(p_icomps)), + particle_runtime_comps(std::move(p_rcomps)), + particle_runtime_icomps(std::move(p_ricomps)) {} /** Copy constructor for NamedComponentParticleContainer */ NamedComponentParticleContainer ( const NamedComponentParticleContainer &) = delete; diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 60578d57f..0ed851e9f 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -2897,13 +2897,13 @@ PhysicalParticleContainer::getIonizationFunc (const WarpXParIter& pti, { WARPX_PROFILE("PhysicalParticleContainer::getIonizationFunc()"); - return IonizationFilterFunc(pti, lev, ngEB, Ex, Ey, Ez, Bx, By, Bz, + return {pti, lev, ngEB, Ex, Ey, Ez, Bx, By, Bz, ionization_energies.dataPtr(), adk_prefactor.dataPtr(), adk_exp_prefactor.dataPtr(), adk_power.dataPtr(), particle_icomps["ionizationLevel"], - ion_atomic_number); + ion_atomic_number}; } PlasmaInjector* PhysicalParticleContainer::GetPlasmaInjector () |