casting.

JustinRayAngus · Jul 7, 2024 · b00f631 · b00f631
1 parent 19d52ec
commit b00f631
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H b/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H
@@ -147,9 +147,9 @@ void ElasticCollisionPerez (
 
           // compute the effective density used for s12 in UpdateMomentumPerezElastic()
           T_PR n12;
-          const T_PR wpmax = std::max(w1[ I1[i1] ],w2[ I2[i2] ]);
-          if (isSameSpecies) { n12 = wpmax*(min_N+max_N-1)/dV; }
-          else { n12 = wpmax*min_N/dV; }
+          const T_PR wpmax = amrex::max(w1[ I1[i1] ],w2[ I2[i2] ]);
+          if (isSameSpecies) { n12 = wpmax*static_cast<T_PR>(min_N+max_N-1)/dV; }
+          else { n12 = wpmax*static_cast<T_PR>(min_N)/dV; }
 
           UpdateMomentumPerezElastic(
               u1x[ I1[i1] ], u1y[ I1[i1] ], u1z[ I1[i1] ],

diff --git a/Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H b/Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H
@@ -125,7 +125,7 @@ void UpdateMomentumPerezElastic (
             const T_PR bmin_qm = static_cast<T_PR>(PhysConst::hbar*0.5/p1stm);
 
             // Set the minimum impact parameter
-            const T_PR bmin = amrex::max(bmin_qm, 0.5*b0);
+            const T_PR bmin = amrex::max(bmin_qm, T_PR(0.5)*b0);
 
             // Compute the Coulomb log lnLmd
             lnLmd = amrex::max( T_PR(2.0),