Skip to content

Commit

Permalink
Merge branch 'develop' into Issue9909_multispeed_DX_Htg_Coil_HSPF2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nigusse
Nigusse authored Aug 29, 2024
2 parents 2ae2538 + a7fe8f7 commit a0a1be5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/EnergyPlus/StandardRatings.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6277,10 +6277,10 @@ namespace StandardRatings {
if (t >= t_ob) {
q_full = Q_H3_Full(nsp) + (Q_H1_Full(nsp) - Q_H3_Full(nsp)) * ((t - (-8.33)) / (8.33 - (-8.33))); // Equation 11.112 AHRI-2023
p_full = P_H3_Full(nsp) + (P_H1_Full(nsp) - P_H3_Full(nsp)) * ((t - (-8.33)) / (8.33 - (-8.33))); // Equation 11.117 AHRI-2023
} else if (t >= (-8.33) && t < t_ob) {
q_full = Q_H3_Full(nsp) + (Q_H2_Full(nsp) - Q_H3_Full(nsp)) * ((t - (-8.33)) / (1.66 - (-8.33))); // Equation 11.113 AHRI-2023
p_full = P_H3_Full(nsp) + (P_H2_Full(nsp) - P_H3_Full(nsp)) * ((t - (-8.33)) / (1.66 - (-8.33))); // Equation 11.118 AHRI-2023
} else if (t < (-8.33)) { // if(t<(-8.33))
} else if (t >= (-8.33)) {
q_full = Q_H3_Full(nsp) + (Q_H2_Full(nsp) - Q_H3_Full(nsp)) * ((t - (-8.33)) / (1.66 - (-8.33))); // Equation 11.113 AHRI-2023
p_full = P_H3_Full(nsp) + (P_H2_Full(nsp) - P_H3_Full(nsp)) * ((t - (-8.33)) / (1.66 - (-8.33))); // Equation 11.118 AHRI-2023
} else {
q_full = Q_H4_Full(nsp) + (Q_H3_Full(nsp) - Q_H4_Full(nsp)) * ((t - (-8.33)) / ((-8.33) - (-15))); // Equation 11.114 AHRI-2023
p_full = P_H4_Full(nsp) + (P_H3_Full(nsp) - P_H4_Full(nsp)) * ((t - (-8.33)) / ((-8.33) - (-15))); // Equation 11.119 AHRI-2023
}
Expand Down

4 comments on commit a0a1be5

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue9909_multispeed_DX_Htg_Coil_HSPF2 (Nigusse) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3691 of 3709 tests passed, 0 test warnings)

Messages:\n

  • 16 tests had: EIO diffs.
  • 18 tests had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 795
  • Failed: 18

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue9909_multispeed_DX_Htg_Coil_HSPF2 (Nigusse) - Win64-Windows-10-VisualStudio-16: OK (2874 of 2874 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue9909_multispeed_DX_Htg_Coil_HSPF2 (Nigusse) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2080 of 2080 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue9909_multispeed_DX_Htg_Coil_HSPF2 (Nigusse) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (797 of 797 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.