Missing sp(x) calls in pack/scalar operations

Author: tcclevenger

components/eamxx/src/physics/p3/impl/p3_dsd2_impl.hpp

@@ -16,7 +16,7 @@ KOKKOS_FUNCTION
 void Functions<S,D>::
 get_cloud_dsd2(
   const Spack& qc, Spack& nc, Spack& mu_c, const Spack& rho, Spack& nu,
-  const view_dnu_table& dnu, Spack& lamc, Spack& cdist, Spack& cdist1, 
+  const view_dnu_table& dnu, Spack& lamc, Spack& cdist, Spack& cdist1,
   const Smask& context)
 {
   lamc.set(context   , 0);
@@ -105,10 +105,10 @@ get_rain_dsd2 (
     lamr.set(qr_gt_small, cbrt(mass_to_d3_factor * nr_lim / qr));
 
     // check for slope
-    const auto lammax = (mu_r+1.)*sp(1.e+5);
+    const auto lammax = (mu_r+sp(1.))*sp(1.e+5);
     //Below, 500 is inverse of max allowable number-weighted mean raindrop size=2mm
     //Since breakup is explicitly included, mean raindrop size can be relatively small
-    const auto lammin = (mu_r+1.)*500; 
+    const auto lammin = (mu_r+sp(1.))*500;
 
     // apply lambda limiters for rain
     const auto lt = qr_gt_small && (lamr < lammin);

components/eamxx/src/physics/p3/impl/p3_ice_classical_nucleation_impl.hpp

@@ -24,31 +24,31 @@ ::ice_classical_nucleation(
   constexpr Scalar pi       = C::Pi;
   constexpr Scalar rho_h2o  = C::RHO_H2O.value;
 
-  // TODO: Verify if qsmall can be unified with other "small" numeric literals 
+  // TODO: Verify if qsmall can be unified with other "small" numeric literals
   constexpr Scalar qsmall   = 1.0e-18;
   constexpr Scalar piov3    = pi/3.0;
 
   // TODO: Verify if 1.0e-18 can be unified with other "small" numeric literals
   constexpr Scalar  mi0     = 4.0*piov3*900.0*1.0e-18; // BAD_CONSTANT!
- 
+
   const Spack Zero(0.0);
   // minimum mass of new crystal due to freezing of cloud droplets done
   // externally (kg)
- 
+
   const Scalar mi0l_min = (4.0/3.0)*pi*rho_h2o*(4.0e-6)*(4.0e-6)*(4.0e-6);
-  Spack mi0l = qc_incld/ekat::max(nc_incld,1.0e6/rho);
+  Spack mi0l = qc_incld/ekat::max(nc_incld,sp(1.0e6)/rho);
   mi0l = ekat::max(mi0l_min, mi0l);
-  
+
   const auto mask = qc_incld > qsmall;
   switch (Iflag) {
     case 1:  // cloud droplet immersion freezing
-      ncheti_cnt.set(mask, frzimm*1.0e6/rho /* frzimm input is in [#/cm3] */ , Zero);
+      ncheti_cnt.set(mask, frzimm*sp(1.0e6)/rho /* frzimm input is in [#/cm3] */ , Zero);
       qcheti_cnt.set(mask, ncheti_cnt*mi0l, Zero);
       break;
     case 2:  // deposition freezing / contact freezing
-      nicnt.set(mask, frzcnt*1.0e6/rho, Zero);
+      nicnt.set(mask, frzcnt*sp(1.0e6)/rho, Zero);
       qicnt.set(mask, nicnt*mi0l, Zero);
-      ninuc_cnt.set(mask, frzdep*1.0e6/rho, Zero);
+      ninuc_cnt.set(mask, frzdep*sp(1.0e6)/rho, Zero);
       qinuc_cnt.set(mask, ninuc_cnt*mi0, Zero);
       break;
     default:

components/eamxx/src/physics/p3/tests/p3_evaporate_rain_unit_tests.cpp

@@ -118,7 +118,7 @@ struct UnitWrap::UnitTest<D>::TestEvapSublPrecip : public UnitWrap::UnitTest<D>:
     //for case with lots of evap, make sure doesn't overdeplete qr_incld
     Functions::evaporate_rain(qr_incld,qc_incld,nr_incld,qi_incld,
 			      //qv -> qv*0.1 to encourage lots of rain evap
-			      cld_frac_l,cld_frac_r,qv*0.1,qv_prev,qv_sat_l,qv_sat_i,
+			      cld_frac_l,cld_frac_r,qv*sp(0.1),qv_prev,qv_sat_l,qv_sat_i,
 			      ab,abi,epsr,epsi_tot,t,t_prev,dqsdt,dt,
 			      qrtend,nrtend);
     REQUIRE( qrtend[0] <= qr_incld[0]/dt);

components/eamxx/src/physics/shoc/impl/shoc_compute_shoc_mix_shoc_length_impl.hpp

@@ -45,9 +45,9 @@ ::compute_shoc_mix_shoc_length(
       Spack brunt_tmp(stable_mask, brunt(k));
 
       // Define length scale for stable cells
-      const auto length_tmp = ekat::sqrt(0.76*tk(k)/0.1/ekat::sqrt(brunt_tmp + 1.e-10));
+      const auto length_tmp = ekat::sqrt(sp(0.76)*tk(k)/sp(0.1)/ekat::sqrt(brunt_tmp + sp(1.e-10)));
       // Limit the stability corrected length scale between 0.1*dz and dz
-	    const auto limited_len = ekat::min(dz_zt(k),ekat::max(0.1*dz_zt(k),length_tmp));
+	    const auto limited_len = ekat::min(dz_zt(k),ekat::max(sp(0.1)*dz_zt(k),length_tmp));
 
       // Set length scale to vertical grid if unstable, otherwise the stability adjusted value.
       shoc_mix(k).set(stable_mask, limited_len, dz_zt(k));

components/eamxx/src/share/physics/eamxx_common_physics_functions_impl.hpp

@@ -462,7 +462,7 @@ ScalarT PhysicsFunctions<DeviceT>::calculate_vmr_from_mmr(const Real& gas_mol_we
   using C = scream::physics::Constants<Real>;
   constexpr Real air_mol_weight   = C::MWdry.value;
 
-  return mmr / (1.0 - qv) * air_mol_weight/gas_mol_weight;
+  return mmr / (sp(1.0) - qv) * air_mol_weight/gas_mol_weight;
 
 }
 
@@ -490,7 +490,7 @@ ScalarT PhysicsFunctions<DeviceT>::calculate_mmr_from_vmr(const Real& gas_mol_we
   constexpr Real air_mol_weight   = C::MWdry.value;
   const Real mol_weight_ratio = gas_mol_weight/air_mol_weight;
 
-  return mol_weight_ratio * vmr * (1.0 - qv);
+  return mol_weight_ratio * vmr * (sp(1.0) - qv);
 
 }
 

components/eamxx/src/share/physics/tests/common_physics_functions_tests.cpp

@@ -303,7 +303,7 @@ void run(std::mt19937_64& engine)
   p = pdf_pres(engine);
   const auto exner1 = PF::exner_function(p);
   const auto exner2 = PF::exner_function(p/2);
-  const auto factor = pow(2.0,Rd*inv_cp);
+  const auto factor = std::pow(sp(2.0),Rd*inv_cp);
   REQUIRE( Check::approx_equal(exner1,factor*exner2,test_tol) );
 
   // Potential temperature property tests:

components/eamxx/src/share/util/tests/combine_ops_tests.cpp

@@ -34,14 +34,9 @@ TEST_CASE ("combine_ops") {
   combine<Replace>(two,x,1,0);
   REQUIRE ( (x==two).all() );
 
-  combine<Update>(two,x,2.0,1.0);
+  combine<Update>(two,x,sp(2.0),sp(1.0));
   REQUIRE ( (x==six).all() );
-  combine<Update,true>(fv,x,2.0,1.0);
-  if (not (x==six).all() ) {
-    std::cout << "x: " << x << "\n";
-    std::cout << " x[0]: " << std::setprecision(18) << x[0] << "\n";
-    std::cout << "fv[0]: " << std::setprecision(18) << fv[0] << "\n";
-  }
+  combine<Update,true>(fv,x,sp(2.0),sp(1.0));
   REQUIRE ( (x==six).all() );
 
   x = two;