Skip to content

Commit

Permalink
Added transition rule, updated epfilter and transitioned idfs (Issue #…
Browse files Browse the repository at this point in the history
  • Loading branch information
Nigusse committed Jun 15, 2017
1 parent a6a5eeb commit fe928ab
Showing 26 changed files with 139 additions and 0 deletions.
15 changes: 15 additions & 0 deletions performance_tests/15zonePSZ.idf
Original file line number Diff line number Diff line change
@@ -7267,6 +7267,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -7551,6 +7552,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -7835,6 +7837,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -8119,6 +8122,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -8403,6 +8407,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -8687,6 +8692,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -8971,6 +8977,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -9255,6 +9262,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -9539,6 +9547,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -9823,6 +9832,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -10107,6 +10117,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -10391,6 +10402,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -10675,6 +10687,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -10959,6 +10972,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -11243,6 +11257,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
1 change: 1 addition & 0 deletions performance_tests/15zonePVAV.idf
Original file line number Diff line number Diff line change
@@ -7706,6 +7706,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
1 change: 1 addition & 0 deletions performance_tests/15zonevav.idf
Original file line number Diff line number Diff line change
@@ -7719,6 +7719,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
1 change: 1 addition & 0 deletions performance_tests/15zonevav_no_reports.idf
Original file line number Diff line number Diff line change
@@ -7719,6 +7719,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
30 changes: 30 additions & 0 deletions performance_tests/30zonePSZ.idf
Original file line number Diff line number Diff line change
@@ -12818,6 +12818,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -13102,6 +13103,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -13386,6 +13388,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -13670,6 +13673,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -13954,6 +13958,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -14238,6 +14243,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -14522,6 +14528,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -14806,6 +14813,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -15090,6 +15098,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -15374,6 +15383,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -15658,6 +15668,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -15942,6 +15953,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -16226,6 +16238,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -16510,6 +16523,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -16794,6 +16808,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -17078,6 +17093,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -17362,6 +17378,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -17646,6 +17663,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -17930,6 +17948,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -18214,6 +18233,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -18498,6 +18518,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -18782,6 +18803,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -19066,6 +19088,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -19350,6 +19373,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -19634,6 +19658,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -19918,6 +19943,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -20202,6 +20228,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -20486,6 +20513,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -20770,6 +20798,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
@@ -21054,6 +21083,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
1 change: 1 addition & 0 deletions performance_tests/30zonePVAV.idf
Original file line number Diff line number Diff line change
@@ -13662,6 +13662,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
1 change: 1 addition & 0 deletions performance_tests/30zonevav.idf
Original file line number Diff line number Diff line change
@@ -13675,6 +13675,7 @@
HVACOperationSchd, !- Fan Schedule Name
CycleOnAny, !- Control Type
1.0, !- Thermostat Tolerance {deltaC}
FixedRunTime, !- Cycling Run Time Control Type
1800; !- Cycling Run Time {s}

BranchList,
Loading

8 comments on commit fe928ab

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

146627003_Issue#6151 (Nigusse) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (2525 of 2539 tests passed, 586 test warnings)

Messages:

  • 600 tests had: AUD diffs.
  • 22 tests had: Table small diffs.
  • 14 tests had: Table big diffs.

Failures:

regression Test Summary

  • Passed: 602
  • Failed: 14

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.

146627003_Issue#6151 (Nigusse) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

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

146627003_Issue#6151 (Nigusse) - x86_64-MacOS-10.9-clang: OK (2485 of 2499 tests passed, 582 test warnings)

Messages:

  • 596 tests had: AUD diffs.
  • 22 tests had: Table small diffs.
  • 14 tests had: Table big diffs.

Failures:

regression Test Summary

  • Passed: 582
  • Failed: 14

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.

146627003_Issue#6151 (Nigusse) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (1305 of 1305 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.

146627003_Issue#6151 (Nigusse) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1906 of 1906 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.

146627003_Issue#6151 (Nigusse) - x86_64-Linux-Ubuntu-14.04-custom_check: OK (0 of 0 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.

146627003_Issue#6151 (Nigusse) - i386-Windows-7-VisualStudio-14: OK (2487 of 2505 tests passed, 581 test warnings)

Messages:

  • 599 tests had: AUD diffs.
  • 22 tests had: Table small diffs.
  • 3 tests had: EIO diffs.
  • 3 tests had: ESO big diffs.
  • 3 tests had: MTR big diffs.
  • 17 tests had: Table big diffs.

Failures:

regression Test Summary

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

146627003_Issue#6151 (Nigusse) - Win64-Windows-7-VisualStudio-14: OK (2489 of 2505 tests passed, 583 test warnings)

Messages:

  • 599 tests had: AUD diffs.
  • 23 tests had: Table small diffs.
  • 2 tests had: EIO diffs.
  • 2 tests had: ESO big diffs.
  • 2 tests had: MTR big diffs.
  • 15 tests had: Table big diffs.

Failures:

regression Test Summary

  • Passed: 583
  • Failed: 16

Build Badge Test Badge

Please # to comment.