Skip to content

Commit

Permalink
fix ep_nocache_psychrometrics
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchute committed Nov 12, 2020
1 parent 283b640 commit 6125dd0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
9 changes: 6 additions & 3 deletions src/EnergyPlus/Psychrometrics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,8 @@ namespace Psychrometrics {

#else

Real64 PsyTwbFnTdbWPb(Real64 const TDB, // dry-bulb temperature {C}
Real64 PsyTwbFnTdbWPb(EnergyPlusData &state,
Real64 const TDB, // dry-bulb temperature {C}
Real64 const dW, // humidity ratio
Real64 const Patm, // barometric pressure {Pascals}
std::string const &CalledFrom // routine this function was called from (error messages)
Expand Down Expand Up @@ -1032,7 +1033,8 @@ namespace Psychrometrics {
std::string const &CalledFrom // routine this function was called from (error messages)
)
#else
Real64 PsyTsatFnHPb(Real64 const H, // enthalpy {J/kg}
Real64 PsyTsatFnHPb(EnergyPlusData &state,
Real64 const H, // enthalpy {J/kg}
Real64 const PB, // barometric pressure {Pascals}
std::string const &CalledFrom // routine this function was called from (error messages)
)
Expand Down Expand Up @@ -1364,7 +1366,8 @@ namespace Psychrometrics {
)

#else
Real64 PsyTsatFnPb(Real64 const Press, // barometric pressure {Pascals}
Real64 PsyTsatFnPb(EnergyPlusData &state,
Real64 const Press, // barometric pressure {Pascals}
std::string const &CalledFrom // routine this function was called from (error messages)
)
#endif
Expand Down
9 changes: 6 additions & 3 deletions src/EnergyPlus/Psychrometrics.hh
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,8 @@ namespace Psychrometrics {

#else

Real64 PsyTwbFnTdbWPb(Real64 const TDB, // dry-bulb temperature {C}
Real64 PsyTwbFnTdbWPb(EnergyPlusData &state,
Real64 const TDB, // dry-bulb temperature {C}
Real64 const dW, // humidity ratio
Real64 const Patm, // barometric pressure {Pascals}
std::string const &CalledFrom = blank_string // routine this function was called from (error messages)
Expand Down Expand Up @@ -790,7 +791,8 @@ namespace Psychrometrics {

#else

Real64 PsyTsatFnHPb(Real64 const H, // enthalpy {J/kg}
Real64 PsyTsatFnHPb(EnergyPlusData &state,
Real64 const H, // enthalpy {J/kg}
Real64 const PB, // barometric pressure {Pascals}
std::string const &CalledFrom = blank_string // routine this function was called from (error messages)
);
Expand Down Expand Up @@ -1168,7 +1170,8 @@ namespace Psychrometrics {
}

#else
Real64 PsyTsatFnPb(Real64 const Press, // barometric pressure {Pascals}
Real64 PsyTsatFnPb(EnergyPlusData &state,
Real64 const Press, // barometric pressure {Pascals}
std::string const &CalledFrom = blank_string // routine this function was called from (error messages)
);
#endif
Expand Down

5 comments on commit 6125dd0

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

fix_nocache_psychrometrics (mitchute) - x86_64-MacOS-10.15-clang-11.0.0: OK (2994 of 2994 tests passed, 11 test warnings)

Messages:\n

  • 11 tests had: AUD diffs.

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

fix_nocache_psychrometrics (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3034 of 3034 tests passed, 14 test warnings)

Messages:\n

  • 14 tests had: AUD diffs.

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

fix_nocache_psychrometrics (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1558 of 1558 tests passed, 0 test warnings)

Build Badge Test Badge Coverage 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.

fix_nocache_psychrometrics (mitchute) - Win64-Windows-10-VisualStudio-16: OK (2250 of 2250 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

fix_nocache_psychrometrics (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (722 of 722 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.