Skip to content

Commit

Permalink
Exclude "general" when testing if new end use sub meter
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonGlazer committed Jan 17, 2020
1 parent a4f7245 commit bc98656
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/EnergyPlus/OutputProcessor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2251,7 +2251,7 @@ namespace OutputProcessor {
}

// End use subcategory
if (!EndUseSub.empty()) {
if (!EndUseSub.empty() && !UtilityRoutines::SameString(EndUseSub,"General")) {
Found = UtilityRoutines::FindItem(EndUseSub + ':' + EndUse + ':' + ResourceType, EnergyMeters);
if (Found != 0) {
++VarMeterArrays(NumVarMeterArrays).NumOnMeters;
Expand Down

7 comments on commit bc98656

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

7556b-other-end-use-subcat-try2 (JasonGlazer) - x86_64-MacOS-10.13-clang: Tests Failed (1991 of 2598 tests passed, 64 test warnings)

Messages:\n

  • 669 tests had: AUD diffs.
  • 655 tests had: MDD diffs.
  • 669 tests had: MTD diffs.
  • 605 tests had: Table big diffs.
  • 243 tests had: BND diffs.
  • 156 tests had: EIO diffs.
  • 43 tests had: ESO small diffs.
  • 50 tests had: MTR small diffs.
  • 3 tests had: ESO big diffs.
  • 3 tests had: MTR big diffs.
  • 99 tests had: RDD diffs.
  • 2 tests had: JSON big diffs.
  • 4 tests had: ERR diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 817
  • Failed: 1

regression Test Summary

  • Passed: 65
  • Failed: 605

SQLiteFixture Test Summary

  • Passed: 75
  • 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.

7556b-other-end-use-subcat-try2 (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: Tests Failed (2028 of 2638 tests passed, 65 test warnings)

Messages:\n

  • 673 tests had: AUD diffs.
  • 659 tests had: MDD diffs.
  • 673 tests had: MTD diffs.
  • 608 tests had: Table big diffs.
  • 244 tests had: BND diffs.
  • 156 tests had: EIO diffs.
  • 45 tests had: ESO small diffs.
  • 52 tests had: MTR small diffs.
  • 3 tests had: ESO big diffs.
  • 3 tests had: MTR big diffs.
  • 99 tests had: RDD diffs.
  • 2 tests had: JSON big diffs.
  • 4 tests had: ERR diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 817
  • Failed: 1

regression Test Summary

  • Passed: 82
  • Failed: 608

SQLiteFixture Test Summary

  • Passed: 75
  • 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.

7556b-other-end-use-subcat-try2 (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

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

7556b-other-end-use-subcat-try2 (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

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

7556b-other-end-use-subcat-try2 (JasonGlazer) - Win64-Windows-10-VisualStudio-16: Tests Failed (1992 of 2598 tests passed, 65 test warnings)

Messages:\n

  • 669 tests had: AUD diffs.
  • 655 tests had: MDD diffs.
  • 669 tests had: MTD diffs.
  • 604 tests had: Table big diffs.
  • 244 tests had: BND diffs.
  • 155 tests had: EIO diffs.
  • 46 tests had: ESO small diffs.
  • 51 tests had: MTR small diffs.
  • 3 tests had: ESO big diffs.
  • 3 tests had: MTR big diffs.
  • 99 tests had: RDD diffs.
  • 2 tests had: JSON big diffs.
  • 4 tests had: ERR diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 817
  • Failed: 1

regression Test Summary

  • Passed: 66
  • Failed: 604

SQLiteFixture Test Summary

  • Passed: 75
  • 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.

7556b-other-end-use-subcat-try2 (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1254 of 1256 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 817
  • Failed: 1

SQLiteFixture Test Summary

  • Passed: 75
  • Child aborted: 1

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.

7556b-other-end-use-subcat-try2 (JasonGlazer) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (675 of 675 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.