Skip to content

Commit

Permalink
Remove synonyms - revert ZoneTempPredictorCorrector exp underflow pro…
Browse files Browse the repository at this point in the history
…tection
  • Loading branch information
mjwitte committed Dec 3, 2019
1 parent 733392e commit 81a0855
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/EnergyPlus/ZoneTempPredictorCorrector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5022,7 +5022,7 @@ namespace ZoneTempPredictorCorrector {
if (TempDepCoef == 0.0) { // B=0
ZT(ZoneNum) = ZoneT1(ZoneNum) + TempIndCoef / AirCap;
} else {
ZT(ZoneNum) = (ZoneT1(ZoneNum) - TempIndCoef / TempDepCoef) * std::exp(max(-50.0,min(700.0, -TempDepCoef / AirCap))) +
ZT(ZoneNum) = (ZoneT1(ZoneNum) - TempIndCoef / TempDepCoef) * std::exp(min(700.0, -TempDepCoef / AirCap)) +
TempIndCoef / TempDepCoef;
}
} else if (SELECT_CASE_var == UseEulerMethod) {
Expand Down Expand Up @@ -5662,7 +5662,7 @@ namespace ZoneTempPredictorCorrector {
if (A == 0.0) { // B=0
ZoneAirHumRatTemp(ZoneNum) = ZoneW1(ZoneNum) + B / C;
} else {
ZoneAirHumRatTemp(ZoneNum) = (ZoneW1(ZoneNum) - B / A) * std::exp(max(-50.0,min(700.0, -A / C))) + B / A;
ZoneAirHumRatTemp(ZoneNum) = (ZoneW1(ZoneNum) - B / A) * std::exp(min(700.0, -A / C)) + B / A;
}
} else if (SELECT_CASE_var == UseEulerMethod) {
ZoneAirHumRatTemp(ZoneNum) = (C * ZoneW1(ZoneNum) + B) / (C + A);
Expand Down

7 comments on commit 81a0855

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

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

RemoveSynonyms-6601PartB (mjwitte) - x86_64-MacOS-10.13-clang: OK (2590 of 2591 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 671
  • Failed: 1

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.

RemoveSynonyms-6601PartB (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2590 of 2591 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 671
  • Failed: 1

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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2630 of 2631 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 674
  • Failed: 1

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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build 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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

Build 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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1249 of 1249 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.

RemoveSynonyms-6601PartB (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (674 of 675 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 674
  • Failed: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.