Skip to content

Commit

Permalink
test inline-ing cached_Tsat
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchute
mitchute committed Nov 17, 2020
1 parent 0d717cd commit 9cdf1b6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 0 additions & 3 deletions src/EnergyPlus/Psychrometrics.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ namespace Psychrometrics {
Array1D<cached_psat_t> cached_Psat; // DIMENSION(0:psatcache_size)
#endif
#ifdef EP_cache_PsyTsatFnPb
Array1D<cached_tsat_pb> cached_Tsat; // DIMENSION(0:tsatcache_size)
#endif
#ifdef EP_cache_PsyTsatFnHPb
Array1D<cached_tsat_h_pb> cached_Tsat_HPb; // DIMENSION(0:tsat_hbp_cache_size)
Expand All @@ -212,7 +211,6 @@ namespace Psychrometrics {
cached_Psat.deallocate();
#endif
#ifdef EP_cache_PsyTsatFnPb
cached_Tsat.deallocate();
#endif
#ifdef EP_cache_PsyTsatFnHPb
cached_Tsat_HPb.deallocate();
Expand Down Expand Up @@ -262,7 +260,6 @@ namespace Psychrometrics {
cached_Psat.allocate({0, psatcache_size});
#endif
#ifdef EP_cache_PsyTsatFnPb
cached_Tsat.allocate({0, tsatcache_size});
#endif
#ifdef EP_cache_PsyTsatFnHPb
cached_Tsat_HPb.allocate({0, tsat_hbp_cache_size});
Expand Down
3 changes: 2 additions & 1 deletion src/EnergyPlus/Psychrometrics.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ namespace Psychrometrics {
extern Array1D<cached_psat_t> cached_Psat; // DIMENSION(0:psatcache_size)
#endif
#ifdef EP_cache_PsyTsatFnPb
extern Array1D<cached_tsat_pb> cached_Tsat; // DIMENSION(0:tsatcache_size)
inline Array1D<cached_tsat_pb> cached_Tsat; // DIMENSION(0:tsatcache_size)
cached_Tsat.allocate({0, tsatcache_size});
#endif
#ifdef EP_cache_PsyTsatFnHPb
extern Array1D<cached_tsat_h_pb> cached_Tsat_HPb; // DIMENSION(0:tsat_hbp_cache_size)
Expand Down

5 comments on commit 9cdf1b6

@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-UnitTestsCoverage-Debug: Build Failed

Build Badge Test Badge Coverage Badge

@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: Build Failed

Messages:\n

  • 685 tests had: EIO diffs.
  • 57 tests had: ERR diffs.
  • 17 tests had: ESO big diffs.
  • 529 tests had: MTR small diffs.
  • 360 tests had: ZSZ small diffs.
  • 21 tests had: Table big diffs.
  • 8 tests had: EDD diffs.
  • 664 tests had: ESO small diffs.
  • 614 tests had: Table small diffs.
  • 299 tests had: SSZ small diffs.
  • 3 tests had: JSON big diffs.
  • 1 test had: MTR big diffs.
  • 2 tests had: SSZ big diffs.

Failures:\n

regression Test Summary

  • Passed: 688
  • Failed: 29

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.

fix_nocache_psychrometrics (mitchute) - Win64-Windows-10-VisualStudio-16: Build Failed

Failures:\n

integration Test Summary

  • Passed: 718
  • Failed: 1

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: Build Failed

Messages:\n

  • 689 tests had: EIO diffs.
  • 669 tests had: ESO small diffs.
  • 616 tests had: Table small diffs.
  • 529 tests had: MTR small diffs.
  • 8 tests had: EDD diffs.
  • 299 tests had: SSZ small diffs.
  • 360 tests had: ZSZ small diffs.
  • 63 tests had: ERR diffs.
  • 15 tests had: ESO big diffs.
  • 22 tests had: Table big diffs.
  • 3 tests had: JSON big diffs.
  • 1 test had: MTR big diffs.
  • 2 tests had: SSZ big diffs.

Failures:\n

regression Test Summary

  • Passed: 708
  • Failed: 29

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.

fix_nocache_psychrometrics (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: Build Failed

Failures:\n

integration Test Summary

  • Passed: 721
  • Timeout: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.