Fix some small warnings identified by clang

usnistgov · Sep 7, 2023 · d6cacec · d6cacec
1 parent c021b75
commit d6cacec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/include/teqp/models/multifluid_reducing.hpp b/include/teqp/models/multifluid_reducing.hpp
@@ -77,7 +77,7 @@ namespace teqp {
             auto [el, swap_needed] = get_BIPdep(collection, identifiers, flags);
 
             double betaT, gammaT, betaV, gammaV;
-            if (el.contains("betaT") && el.contains("gammaT") && el.contains("betaV") & el.contains("gammaV")) {
+            if (el.contains("betaT") && el.contains("gammaT") && el.contains("betaV") && el.contains("gammaV")) {
                 betaT = el["betaT"]; gammaT = el["gammaT"]; betaV = el["betaV"]; gammaV = el["gammaV"];
                 // Backwards order of components, flip beta values
                 if (swap_needed) {
@@ -281,4 +281,4 @@ namespace teqp {
 
     using ReducingFunctions = ReducingTermContainer<MultiFluidReducingFunction, MultiFluidInvariantReducingFunction>;
 
-}; // namespace teqp
+}; // namespace teqp
diff --git a/include/teqp/models/saft/polar_terms.hpp b/include/teqp/models/saft/polar_terms.hpp
@@ -726,6 +726,9 @@ class MultipolarContributionGubbinsTwu {
             // The packing fraction is defined by eta = pi/6*rho^*, so use the (temperature-dependent) eta to obtain rho^*
             rhostar = forceeval(packing_fraction/(static_cast<double>(EIGEN_PI)/6.0));
         }
+        else{
+            throw teqp::InvalidArgument("The method used to determine rho^* is invalid");
+        }
         return rhostar;
     }