One more standard rating tweak, try to suppress psych warnings

NREL · Oct 31, 2023 · 768e703 · 768e703 · nrel-bot · Oct 31, 2023
1 parent cf9d23f
commit 768e703
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/EnergyPlus/Psychrometrics.cc b/src/EnergyPlus/Psychrometrics.cc
@@ -324,11 +324,11 @@ namespace Psychrometrics {
 
         DISABLE_WARNING_PUSH
         DISABLE_WARNING_STRICT_ALIASING
-        // cppcheck-suppress invalidPointerCast
+        // cppcheck-suppress[invalidPointerCast,unmatchedSuppression]
         std::uint64_t Tdb_tag = *reinterpret_cast<std::uint64_t const *>(&Tdb) >> Grid_Shift;
-        // cppcheck-suppress invalidPointerCast
+        // cppcheck-suppress[invalidPointerCast,unmatchedSuppression]
         std::uint64_t W_tag = *reinterpret_cast<std::uint64_t const *>(&W) >> Grid_Shift;
-        // cppcheck-suppress invalidPointerCast
+        // cppcheck-suppress[invalidPointerCast,unmatchedSuppression]
         std::uint64_t Pb_tag = *reinterpret_cast<std::uint64_t const *>(&Pb) >> Grid_Shift;
         DISABLE_WARNING_POP
 

diff --git a/src/EnergyPlus/StandardRatings.cc b/src/EnergyPlus/StandardRatings.cc
@@ -5063,13 +5063,13 @@ namespace StandardRatings {
                 } else if (bl >= q_full) {
                     // CASE 3 : 11.2.2.3.3 AHRI-2023
                     // Building Load is greater than the capacity of the unit at the Full Compressor Speed, q_full <= bl or (bl >= q_full:)
-                    if (t > (-15) && t <= (-8.33)) {
+                    if (t > (-15) && t < (-8.33)) {
                         Real64 t_ratio = (t - (-15)) / ((-8.33) - (-15));
                         // Equation 11.203 AHRI-2023
                         q_full = q_H4_full + (q_H3_full - q_H4_full) * t_ratio;
                         // Equation 11.204 AHRI-2023
                         p_full = p_H4_full + (p_H3_full - p_H4_full) * t_ratio;
-                    } else if (t < (-15)) {
+                    } else if (t <= (-15)) {
                         Real64 t_ratio = (t - (-15)) / (8.33 - (-8.33));
                         // Equation 11.205 AHRI-2023
                         q_full = q_H4_full + (q_H1_full - q_H3_full) * t_ratio;