Skip to content

Commit

Permalink
Space-Fix 9135 DesignSpecification:OutdoorAir:SpaceList
Browse files Browse the repository at this point in the history
  • Loading branch information
mjwitte committed Oct 18, 2021
1 parent 580cc1f commit a4fcb58
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/EnergyPlus/ZoneEquipmentManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1324,6 +1324,7 @@ void SetUpZoneSizingArrays(EnergyPlusData &state)
}

// Populate DesignSpecification:OutdoorAir:SpaceList spaces
bool dsoaError = false;
for (int oaIndex = 1; oaIndex <= state.dataSize->NumOARequirements; ++oaIndex) {
auto &thisOAReq = state.dataSize->OARequirements(oaIndex);
// If this is a DesignSpecification:OutdoorAir:SpaceList check to make sure spaces are valid and belong to this zone
Expand All @@ -1336,13 +1337,15 @@ void SetUpZoneSizingArrays(EnergyPlusData &state)
} else {
ShowSevereError(state, "SetUpZoneSizingArrays: DesignSpecification:OutdoorAir:SpaceList=" + thisOAReq.Name);
ShowContinueError(state, "Space Name=" + thisSpaceName + " not found.");
dsoaError = true;
ErrorsFound = true;
}
// Check for duplicate spaces
for (int loop = 1; loop <= int(thisOAReq.dsoaSpaceIndexes.size()) - 1; ++loop) {
if (thisSpaceNum == thisOAReq.dsoaSpaceIndexes(loop)) {
ShowSevereError(state, "SetUpZoneSizingArrays: DesignSpecification:OutdoorAir:SpaceList=" + thisOAReq.Name);
ShowContinueError(state, "Space Name=" + thisSpaceName + " appears more than once in list.");
ShowContinueError(state, "Space Name=" + thisSpaceName + " appears more than once in the list.");
dsoaError = true;
ErrorsFound = true;
}
}
Expand All @@ -1361,7 +1364,7 @@ void SetUpZoneSizingArrays(EnergyPlusData &state)
Real64 ZoneMinOccupancy = 0.;
ZoneIndex = state.dataSize->FinalZoneSizing(CtrlZoneNum).ActualZoneNum;
int DSOAPtr = state.dataSize->FinalZoneSizing(CtrlZoneNum).ZoneDesignSpecOAIndex; // index to DesignSpecification:OutdoorAir object
if (DSOAPtr > 0) {
if ((DSOAPtr > 0) && !dsoaError) {
auto &thisOAReq = state.dataSize->OARequirements(DSOAPtr);
// If this is a DesignSpecification:OutdoorAir:SpaceList check to make sure spaces are valid and belong to this zone
if (thisOAReq.numDSOA > 0) {
Expand Down Expand Up @@ -1425,7 +1428,11 @@ void SetUpZoneSizingArrays(EnergyPlusData &state)
state.dataZoneEquip->ZoneEquipConfig(CtrlZoneNum).ZoneDesignSpecOAIndex = DSOAPtr; // store for later use
state.dataZoneEquip->ZoneEquipConfig(CtrlZoneNum).ZoneAirDistributionIndex =
state.dataSize->FinalZoneSizing(CtrlZoneNum).ZoneAirDistributionIndex; // store for later use
OAVolumeFlowRate = DataSizing::calcDesignSpecificationOutdoorAir(state, DSOAPtr, ZoneIndex, UseOccSchFlag, UseMinOASchFlag);
if (!dsoaError) {
OAVolumeFlowRate = DataSizing::calcDesignSpecificationOutdoorAir(state, DSOAPtr, ZoneIndex, UseOccSchFlag, UseMinOASchFlag);
} else {
OAVolumeFlowRate = 0.0;
}

// Zone(ZoneIndex)%Multiplier and Zone(ZoneIndex)%ListMultiplier applied in CalcDesignSpecificationOutdoorAir
state.dataSize->FinalZoneSizing(CtrlZoneNum).MinOA = OAVolumeFlowRate;
Expand Down

5 comments on commit a4fcb58

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

SpaceReleaseBranch (mjwitte) - x86_64-MacOS-10.15-clang-11.0.0: OK (2446 of 2446 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.

SpaceReleaseBranch (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (2467 of 2467 tests passed, 0 test warnings)

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.

SpaceReleaseBranch (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2425 of 2425 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.

SpaceReleaseBranch (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1712 of 1712 tests passed, 0 test warnings)

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

SpaceReleaseBranch (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (734 of 737 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 734
  • Timeout: 3

Build Badge Test Badge Coverage Badge

Please sign in to comment.