Skip to content

Commit

Permalink
Extend occupied internal gain types for UFAD and DisplVent
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjwitte
mjwitte committed Mar 13, 2024
1 parent 1cdf1b1 commit baa961f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
20 changes: 10 additions & 10 deletions src/EnergyPlus/DisplacementVentMgr.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ namespace RoomAir {

void CalcDispVent3Node(EnergyPlusData &state, int ZoneNum); // Which Zonenum

static constexpr std::array<DataHeatBalance::IntGainType, 31> IntGainTypesOccupied = {
static constexpr std::array<DataHeatBalance::IntGainType, 51> IntGainTypesOccupied = {
DataHeatBalance::IntGainType::People,
DataHeatBalance::IntGainType::WaterHeaterMixed,
DataHeatBalance::IntGainType::WaterHeaterStratified,
Expand Down Expand Up @@ -109,15 +109,7 @@ namespace RoomAir {
DataHeatBalance::IntGainType::RefrigerationSystemSuctionPipe,
DataHeatBalance::IntGainType::RefrigerationSecondaryReceiver,
DataHeatBalance::IntGainType::RefrigerationSecondaryPipe,
DataHeatBalance::IntGainType::RefrigerationWalkIn};

static constexpr std::array<DataHeatBalance::IntGainType, 2> IntGainTypesMixedSubzone = {DataHeatBalance::IntGainType::DaylightingDeviceTubular,
DataHeatBalance::IntGainType::Lights};

// Explicitly list internal gains not applicable for Displacement Vent
static constexpr std::array<DataHeatBalance::IntGainType, 22> ExcludedIntGainTypes = {
DataHeatBalance::IntGainType::ZoneContaminantSourceAndSinkCarbonDioxide,
DataHeatBalance::IntGainType::ZoneContaminantSourceAndSinkGenericContam,
DataHeatBalance::IntGainType::RefrigerationWalkIn,
DataHeatBalance::IntGainType::RefrigerationTransSysAirCooledGasCooler,
DataHeatBalance::IntGainType::RefrigerationTransSysSuctionPipeMT,
DataHeatBalance::IntGainType::RefrigerationTransSysSuctionPipeLT,
Expand All @@ -139,6 +131,14 @@ namespace RoomAir {
DataHeatBalance::IntGainType::ElectricLoadCenterConverter,
DataHeatBalance::IntGainType::FanSystemModel};

static constexpr std::array<DataHeatBalance::IntGainType, 2> IntGainTypesMixedSubzone = {DataHeatBalance::IntGainType::DaylightingDeviceTubular,
DataHeatBalance::IntGainType::Lights};

// Explicitly list internal gains not applicable for Displacement Vent
static constexpr std::array<DataHeatBalance::IntGainType, 2> ExcludedIntGainTypes = {
DataHeatBalance::IntGainType::ZoneContaminantSourceAndSinkCarbonDioxide,
DataHeatBalance::IntGainType::ZoneContaminantSourceAndSinkGenericContam};

} // namespace RoomAir

struct DisplacementVentMgrData : BaseGlobalStruct
Expand Down
22 changes: 11 additions & 11 deletions src/EnergyPlus/UFADManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ namespace RoomAir {
} // END FLOOR
}

static constexpr std::array<DataHeatBalance::IntGainType, 31> IntGainTypesOccupied = {
static constexpr std::array<DataHeatBalance::IntGainType, 51> IntGainTypesOccupied = {
DataHeatBalance::IntGainType::People,
DataHeatBalance::IntGainType::WaterHeaterMixed,
DataHeatBalance::IntGainType::WaterHeaterStratified,
Expand Down Expand Up @@ -705,16 +705,7 @@ namespace RoomAir {
DataHeatBalance::IntGainType::RefrigerationSystemSuctionPipe,
DataHeatBalance::IntGainType::RefrigerationSecondaryReceiver,
DataHeatBalance::IntGainType::RefrigerationSecondaryPipe,
DataHeatBalance::IntGainType::RefrigerationWalkIn};

static constexpr std::array<DataHeatBalance::IntGainType, 2> IntGainTypesUpSubzone = {DataHeatBalance::IntGainType::DaylightingDeviceTubular,
DataHeatBalance::IntGainType::Lights};

// Explicitly list internal gains not applicable for UFAD
// Explicitly list internal gains not applicable for Displacement Vent
static constexpr std::array<DataHeatBalance::IntGainType, 22> ExcludedIntGainTypes = {
DataHeatBalance::IntGainType::ZoneContaminantSourceAndSinkCarbonDioxide,
DataHeatBalance::IntGainType::ZoneContaminantSourceAndSinkGenericContam,
DataHeatBalance::IntGainType::RefrigerationWalkIn,
DataHeatBalance::IntGainType::RefrigerationTransSysAirCooledGasCooler,
DataHeatBalance::IntGainType::RefrigerationTransSysSuctionPipeMT,
DataHeatBalance::IntGainType::RefrigerationTransSysSuctionPipeLT,
Expand All @@ -736,6 +727,15 @@ namespace RoomAir {
DataHeatBalance::IntGainType::ElectricLoadCenterConverter,
DataHeatBalance::IntGainType::FanSystemModel};

static constexpr std::array<DataHeatBalance::IntGainType, 2> IntGainTypesUpSubzone = {DataHeatBalance::IntGainType::DaylightingDeviceTubular,
DataHeatBalance::IntGainType::Lights};

// Explicitly list internal gains not applicable for UFAD
// Explicitly list internal gains not applicable for Displacement Vent
static constexpr std::array<DataHeatBalance::IntGainType, 2> ExcludedIntGainTypes = {
DataHeatBalance::IntGainType::ZoneContaminantSourceAndSinkCarbonDioxide,
DataHeatBalance::IntGainType::ZoneContaminantSourceAndSinkGenericContam};

void CalcUFADInt(EnergyPlusData &state, int const ZoneNum) // index number for the specified zone
{

Expand Down

5 comments on commit baa961f

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moreRobustIntGainSubtotals (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2766 of 2766 tests passed, 0 test warnings)

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.

moreRobustIntGainSubtotals (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3595 of 3595 tests passed, 0 test warnings)

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.

moreRobustIntGainSubtotals (mjwitte) - x86_64-MacOS-10.18-clang-15.0.0: OK (3554 of 3554 tests passed, 0 test warnings)

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.

moreRobustIntGainSubtotals (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1978 of 1978 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.

moreRobustIntGainSubtotals (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (791 of 791 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.