Merge pull request #571 from lanl/jmm/warning

SetRhoPMin shouldn't be a host device function

Author: Yurlungur

singularity-eos/closure/mixed_cell_models.hpp

@@ -222,12 +222,12 @@ struct IdentityOperator {
 };
 template <typename Data_t, typename Operator_t = IdentityOperator>
 PORTABLE_FORCEINLINE_FUNCTION Real
-sum_neumaier(Data_t &&data, std::size_t n, std::size_t offset = 0, std::size_t iskip = -1,
+sum_neumaier(Data_t &&data, std::size_t n, std::size_t offset = 0, int iskip = -1,
              const Operator_t &op = IdentityOperator()) {
   Real sum = 0;
   Real c = 0; // correction
   for (std::size_t i = 0; i < n; ++i) {
-    if (i == iskip) continue;
+    if (iskip >= 0 && i == static_cast<std::size_t>(iskip)) continue;
     Real x = op(data[i + offset]);
     Real t = sum + x;
     if (std::abs(sum) >= std::abs(x)) {

singularity-eos/eos/eos_spiner_common.hpp

@@ -53,10 +53,8 @@ PORTABLE_FORCEINLINE_FUNCTION Real from_log(const Real lx, const Real offset) {
   return FastMath::pow10(lx) - offset;
 }
 
-PORTABLE_INLINE_FUNCTION Real SetRhoPMin(DataBox &P, DataBox &rho_at_pmin,
-                                         const bool pmin_vapor_dome,
-                                         const Real VAPOR_DPDR_THRESH,
-                                         const Real lRhoOffset) {
+inline Real SetRhoPMin(DataBox &P, DataBox &rho_at_pmin, const bool pmin_vapor_dome,
+                       const Real VAPOR_DPDR_THRESH, const Real lRhoOffset) {
   Real PMin = std::numeric_limits<Real>::max();
   const auto lTs = P.range(0);
   const auto lRs = P.range(1);