diff options
Diffstat (limited to 'Source/Particles/Collision/BinaryCollision')
3 files changed, 10 insertions, 9 deletions
diff --git a/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H b/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H index 658218962..3387f606a 100644 --- a/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H +++ b/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H @@ -74,9 +74,9 @@ public: index_type const* AMREX_RESTRICT I2, SoaData_type soa_1, SoaData_type soa_2, GetParticlePosition /*get_position_1*/, GetParticlePosition /*get_position_2*/, - amrex::Real const q1, amrex::Real const q2, - amrex::Real const m1, amrex::Real const m2, - amrex::Real const dt, amrex::Real const dV, + amrex::ParticleReal const q1, amrex::ParticleReal const q2, + amrex::ParticleReal const m1, amrex::ParticleReal const m2, + amrex::ParticleReal const dt, amrex::ParticleReal const dV, index_type const /*cell_start_pair*/, index_type* /*p_mask*/, index_type* /*p_pair_indices_1*/, index_type* /*p_pair_indices_2*/, amrex::ParticleReal* /*p_pair_reaction_weight*/, @@ -85,12 +85,12 @@ public: ElasticCollisionPerez( I1s, I1e, I2s, I2e, I1, I2, soa_1, soa_2, - q1, q2, m1, m2, amrex::Real(-1.0), amrex::Real(-1.0), + q1, q2, m1, m2, -1.0_prt, -1.0_prt, dt, m_CoulombLog, dV, engine ); } private: - amrex::Real m_CoulombLog; + amrex::ParticleReal m_CoulombLog; }; #endif // PAIRWISE_COULOMB_COLLISION_FUNC_H_ diff --git a/Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H b/Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H index 38ddc5481..fb7dc4da1 100644 --- a/Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H +++ b/Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H @@ -106,7 +106,8 @@ void UpdateMomentumPerezElastic ( ( m1*g1s*m2*g2s/(p1sm*p1sm*inv_c2) + T_R(1.0) ); // Compute the minimal impact parameter - T_R bmin = amrex::max(PhysConst::hbar*MathConst::pi/p1sm,b0); + constexpr T_R hbar_pi = static_cast<T_R>(PhysConst::hbar*MathConst::pi); + const T_R bmin = amrex::max(hbar_pi/p1sm, b0); // Compute the Coulomb log lnLmd lnLmd = amrex::max( T_R(2.0), diff --git a/Source/Particles/Collision/BinaryCollision/NuclearFusion/SingleNuclearFusionEvent.H b/Source/Particles/Collision/BinaryCollision/NuclearFusion/SingleNuclearFusionEvent.H index c59ad1a12..30c054bc4 100644 --- a/Source/Particles/Collision/BinaryCollision/NuclearFusion/SingleNuclearFusionEvent.H +++ b/Source/Particles/Collision/BinaryCollision/NuclearFusion/SingleNuclearFusionEvent.H @@ -58,10 +58,10 @@ void SingleNuclearFusionEvent (const amrex::ParticleReal& u1x, const amrex::Part const amrex::Real& dt, const amrex::Real& dV, const int& pair_index, index_type* AMREX_RESTRICT p_mask, amrex::ParticleReal* AMREX_RESTRICT p_pair_reaction_weight, - const amrex::Real& fusion_multiplier, + const amrex::ParticleReal& fusion_multiplier, const int& multiplier_ratio, - const amrex::Real& probability_threshold, - const amrex::Real& probability_target_value, + const amrex::ParticleReal& probability_threshold, + const amrex::ParticleReal& probability_target_value, const NuclearFusionType& fusion_type, const amrex::RandomEngine& engine) { |