Skip to content

Commit

Permalink
Remove AirTerminal:SingleDuct:Uncontrolled - fix system sizing and ot…
Browse files Browse the repository at this point in the history 
…her cleanup
  • Loading branch information
@mjwitte
mjwitte committed Oct 10, 2019
1 parent 7bb6f5b commit 748b978
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/EnergyPlus/MixedAir.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1892,6 +1892,7 @@ namespace MixedAir {
if (UtilityRoutines::SameString(ZoneEquipList(EquipListNum).EquipName(EquipNum),
AirDistUnit(ADUNum).Name)) {
if ((AirDistUnit(ADUNum).EquipType_Num(EquipNum) == SingleDuctVAVReheat) ||
(AirDistUnit(ADUNum).EquipType_Num(EquipNum) == SingleDuctConstVolNoReheat) ||
(AirDistUnit(ADUNum).EquipType_Num(EquipNum) == SingleDuctConstVolReheat) ||
(AirDistUnit(ADUNum).EquipType_Num(EquipNum) == SingleDuctVAVNoReheat) ||
(AirDistUnit(ADUNum).EquipType_Num(EquipNum) == SingleDuctVAVReheatVSFan) ||
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/SingleDuct.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ namespace SingleDuct {
}
Sys(SysNum).ReheatAirOutletNode = Sys(SysNum).OutletNodeNum;
Sys(SysNum).MaxAirVolFlowRate = Numbers(1);
Sys(SysNum).ZoneMinAirFrac = 0.0;
Sys(SysNum).ZoneMinAirFrac = 1.0;
Sys(SysNum).ZoneMinAirFracMethod = MinFracNotUsed;
Sys(SysNum).DamperHeatingAction = HeatingActionNotUsed;
if (Sys(SysNum).ReheatComp_Num == HCoilType_SteamAirHeating) {
Expand Down Expand Up @@ -1197,7 +1197,7 @@ namespace SingleDuct {
cAlphaFields(4));

Sys(SysNum).MaxAirVolFlowRate = Numbers(1);
Sys(SysNum).ZoneMinAirFrac = 0.0;
Sys(SysNum).ZoneMinAirFrac = 1.0;
Sys(SysNum).ZoneMinAirFracMethod = MinFracNotUsed;
Sys(SysNum).DamperHeatingAction = HeatingActionNotUsed;

Expand Down
3 changes: 2 additions & 1 deletion src/EnergyPlus/SizingManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,8 @@ namespace SizingManager {
DataSizing::VpzClgByZone(termUnitSizingIndex) =
SingleDuct::Sys(singleDuctATUNum).MaxAirVolFlowRate; // store std 62.1 values

if (SingleDuct::Sys(singleDuctATUNum).SysType_Num == SingleDuct::SingleDuctConstVolReheat) {
if (SingleDuct::Sys(singleDuctATUNum).SysType_Num == SingleDuct::SingleDuctConstVolReheat ||
SingleDuct::Sys(singleDuctATUNum).SysType_Num == SingleDuct::SingleDuctConstVolNoReheat) {
airLoopHeatingMinimumFlowRateSum += SingleDuct::Sys(singleDuctATUNum).MaxAirVolFlowRate;
airLoopHeatingMaximumFlowRateSum += SingleDuct::Sys(singleDuctATUNum).MaxAirVolFlowRate;

Expand Down

6 comments on commit 748b978

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

removeAirTermSDUncontrolled (mjwitte) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 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.

removeAirTermSDUncontrolled (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.

removeAirTermSDUncontrolled (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2578 of 2619 tests passed, 142 test warnings)

Messages:\n

  • 172 tests had: AUD diffs.
  • 172 tests had: BND diffs.
  • 183 tests had: EIO diffs.
  • 158 tests had: RDD diffs.
  • 16 tests had: ESO small diffs.
  • 30 tests had: MTD diffs.
  • 17 tests had: MTR small diffs.
  • 15 tests had: Table small diffs.
  • 36 tests had: ESO big diffs.
  • 27 tests had: MTR big diffs.
  • 34 tests had: Table big diffs.
  • 5 tests had: ERR diffs.
  • 5 tests had: EDD diffs.
  • 1 test had: MDD diffs.

Failures:\n

regression Test Summary

  • Passed: 648
  • Failed: 41

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.

removeAirTermSDUncontrolled (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1239 of 1239 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.

removeAirTermSDUncontrolled (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2538 of 2579 tests passed, 142 test warnings)

Messages:\n

  • 172 tests had: AUD diffs.
  • 172 tests had: BND diffs.
  • 183 tests had: EIO diffs.
  • 158 tests had: RDD diffs.
  • 16 tests had: ESO small diffs.
  • 30 tests had: MTD diffs.
  • 17 tests had: MTR small diffs.
  • 15 tests had: Table small diffs.
  • 27 tests had: MTR big diffs.
  • 34 tests had: Table big diffs.
  • 36 tests had: ESO big diffs.
  • 5 tests had: ERR diffs.
  • 5 tests had: EDD diffs.
  • 1 test had: MDD diffs.

Failures:\n

regression Test Summary

  • Passed: 628
  • Failed: 41

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.

removeAirTermSDUncontrolled (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (672 of 674 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 672
  • Failed: 1
  • Timeout: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.