Skip to content

Commit

Permalink
revised allowed fan types.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nigusse
Nigusse committed Jun 10, 2019
1 parent 13302b6 commit 3ff729a
Showing 1 changed file with 20 additions and 18 deletions.
38 changes: 20 additions & 18 deletions src/EnergyPlus/EvaporativeCoolers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3638,8 +3638,8 @@ namespace EvaporativeCoolers {
// Using/Aliasing
using BranchNodeConnections::SetUpCompSets;
using DataGlobals::NumOfZones;
using DataHVACGlobals::FanType_SimpleConstVolume;
using DataHVACGlobals::FanType_SimpleOnOff;
// using DataHVACGlobals::FanType_SimpleConstVolume;
// using DataHVACGlobals::FanType_SimpleOnOff;
using DataSizing::ZoneHVACSizing;
using DataZoneEquipment::ZoneEquipConfig;
using Fans::GetFanAvailSchPtr;
Expand Down Expand Up @@ -3782,7 +3782,8 @@ namespace EvaporativeCoolers {
}

if (ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_SimpleOnOff ||
ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_SystemModelObject) {
ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_SystemModelObject ||
ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_ComponentModel) {
ZoneEvapUnit(UnitLoop).OpMode = DataHVACGlobals::CycFanCycCoil;
} else {
ZoneEvapUnit(UnitLoop).OpMode = DataHVACGlobals::ContFanCycCoil;
Expand Down Expand Up @@ -3950,33 +3951,34 @@ namespace EvaporativeCoolers {

// check that fan type is consistent with control method
if (ZoneEvapUnit(UnitLoop).ControlSchemeType == ZoneCoolingLoadVariableSpeedFan) { // must have a VS fan type
if (ZoneEvapUnit(UnitLoop).FanType_Num == FanType_SimpleConstVolume) {
if (ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_SimpleConstVolume) {
ShowSevereError(CurrentModuleObject + "=\"" + ZoneEvapUnit(UnitLoop).Name + "\" invalid data.");
ShowContinueError("Fan:ConstantVolume is not consistent with control method ZoneCoolingLoadVariableSpeedFan.");
ShowContinueError("Change to a variable speed fan object type");
ErrorsFound = true;
} else if (ZoneEvapUnit(UnitLoop).FanType_Num == FanType_SimpleOnOff) {
} else if (ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_SimpleOnOff) {
ShowSevereError(CurrentModuleObject + "=\"" + ZoneEvapUnit(UnitLoop).Name + "\" invalid data.");
ShowContinueError("Fan:OnOff is not consistent with control method ZoneCoolingLoadVariableSpeedFan.");
ShowContinueError("Change to a variable speed fan object type");
ErrorsFound = true;
}
}

// check that fan type is consistent with control methods ZoneCoolingLoadOnOffCycling and ZoneTemperatureDeadBandOnOffCycling
if ((ZoneEvapUnit(UnitLoop).ControlSchemeType == ZoneCoolingLoadOnOffCycling) ||
(ZoneEvapUnit(UnitLoop).ControlSchemeType == ZoneTemperatureDeadBandOnOffCycling)) {
if (UtilityRoutines::SameString(ZoneEvapUnit(UnitLoop).FanObjectClassName, "Fan:ComponentModel") ||
UtilityRoutines::SameString(ZoneEvapUnit(UnitLoop).FanObjectClassName, "Fan:ConstantVolume") ||
UtilityRoutines::SameString(ZoneEvapUnit(UnitLoop).FanObjectClassName, "Fan:VariableVolume")) {
//// check that fan type is consistent with control methods ZoneCoolingLoadOnOffCycling and ZoneTemperatureDeadBandOnOffCycling
// if ((ZoneEvapUnit(UnitLoop).ControlSchemeType == ZoneCoolingLoadOnOffCycling) ||
// (ZoneEvapUnit(UnitLoop).ControlSchemeType == ZoneTemperatureDeadBandOnOffCycling)) {

ShowSevereError(CurrentModuleObject + "=\"" + ZoneEvapUnit(UnitLoop).Name + "\" invalid data.");
ShowContinueError(DataHVACGlobals::cFanTypes(ZoneEvapUnit(UnitLoop).FanType_Num) + " is not consistent ");
ShowContinueError("with cooler control methods ZoneCoolingLoadOnOffCycling or ZoneTemperatureDeadBandOnOffCycling.");
ShowContinueError("Change to Fan:OnOff or Fan:SystemModel fan object type");
ErrorsFound = true;
}
}
// if (ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_SimpleConstVolume ||
// ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_ComponentModel ||
// ZoneEvapUnit(UnitLoop).FanType_Num == DataHVACGlobals::FanType_SimpleVAV) {

// ShowSevereError(CurrentModuleObject + "=\"" + ZoneEvapUnit(UnitLoop).Name + "\" invalid data.");
// ShowContinueError(DataHVACGlobals::cFanTypes(ZoneEvapUnit(UnitLoop).FanType_Num) + " is not consistent ");
// ShowContinueError("with cooler control methods ZoneCoolingLoadOnOffCycling or ZoneTemperatureDeadBandOnOffCycling.");
// ShowContinueError("Change to Fan:OnOff, Fan:ComponentModel or Fan:SystemModel fan object type");
// ErrorsFound = true;
// }
//}
} // unit loop
}

Expand Down

7 comments on commit 3ff729a

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

166330897_Issue6707 (Nigusse) - 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.

166330897_Issue6707 (Nigusse) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (9 of 9 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.

166330897_Issue6707 (Nigusse) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2467 of 2470 tests passed, 0 test warnings)

Messages:\n

  • 3 tests had: AUD diffs.
  • 3 tests had: EIO diffs.
  • 3 tests had: ESO big diffs.
  • 3 tests had: MTR big diffs.
  • 3 tests had: RDD diffs.
  • 3 tests had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 675
  • Failed: 3

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

166330897_Issue6707 (Nigusse) - x86_64-MacOS-10.13-clang: OK (2427 of 2430 tests passed, 0 test warnings)

Messages:\n

  • 3 tests had: AUD diffs.
  • 3 tests had: EIO diffs.
  • 3 tests had: ESO big diffs.
  • 3 tests had: MTR big diffs.
  • 3 tests had: RDD diffs.
  • 3 tests had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 655
  • Failed: 3

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.

166330897_Issue6707 (Nigusse) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1112 of 1112 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.

166330897_Issue6707 (Nigusse) - Win64-Windows-10-VisualStudio-16: OK (2427 of 2430 tests passed, 0 test warnings)

Messages:\n

  • 3 tests had: AUD diffs.
  • 3 tests had: EIO diffs.
  • 3 tests had: ESO big diffs.
  • 3 tests had: MTR big diffs.
  • 3 tests had: RDD diffs.
  • 3 tests had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 655
  • Failed: 3

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.

166330897_Issue6707 (Nigusse) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (663 of 663 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.