Skip to content

Commit

Permalink
Merge branch 'develop' into Improved-duct-model
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Feb 8, 2024
2 parents 69eb42d + fe5ebf3 commit f4cc57c
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 3 deletions.
30 changes: 27 additions & 3 deletions src/EnergyPlus/AirLoopHVACDOAS.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,15 @@ namespace AirLoopHVACDOAS {
for (auto const &NodeDOASName : NodeArray) {
num += 1;
std::string name = Util::makeUPPER(NodeDOASName.at("inlet_node_name").get<std::string>());
int NodeNum = Util::FindItemInList(name, state.dataLoopNodes->NodeID);
int NodeNum = NodeInputManager::GetOnlySingleNode(state,
name,
errorsFound,
DataLoopNode::ConnectionObjectType::AirLoopHVACMixer,
thisObjectName,
DataLoopNode::NodeFluidType::Air,
DataLoopNode::ConnectionType::Inlet,
NodeInputManager::CompFluidStream::Primary,
DataLoopNode::ObjectIsParent);
if (NodeNum > 0 && num <= thisMixer.numOfInletNodes) {
thisMixer.InletNodeName.push_back(name);
thisMixer.InletNodeNum.push_back(NodeNum);
Expand Down Expand Up @@ -383,7 +391,15 @@ namespace AirLoopHVACDOAS {

thisSplitter.name = Util::makeUPPER(thisObjectName);
thisSplitter.InletNodeName = Util::makeUPPER(fields.at("inlet_node_name").get<std::string>());
thisSplitter.InletNodeNum = Util::FindItemInList(thisSplitter.InletNodeName, state.dataLoopNodes->NodeID);
thisSplitter.InletNodeNum = NodeInputManager::GetOnlySingleNode(state,
thisSplitter.InletNodeName,
errorsFound,
DataLoopNode::ConnectionObjectType::AirLoopHVACSplitter,
thisObjectName,
DataLoopNode::NodeFluidType::Air,
DataLoopNode::ConnectionType::Inlet,
NodeInputManager::CompFluidStream::Primary,
DataLoopNode::ObjectIsParent);
thisSplitter.m_AirLoopSplitter_Num = AirLoopSplitterNum - 1;

auto NodeNames = fields.find("nodes");
Expand All @@ -395,7 +411,15 @@ namespace AirLoopHVACDOAS {
num += 1;

std::string name = Util::makeUPPER(NodeDOASName.at("outlet_node_name").get<std::string>());
int NodeNum = Util::FindItemInList(name, state.dataLoopNodes->NodeID);
int NodeNum = NodeInputManager::GetOnlySingleNode(state,
name,
errorsFound,
DataLoopNode::ConnectionObjectType::AirLoopHVACSplitter,
thisObjectName,
DataLoopNode::NodeFluidType::Air,
DataLoopNode::ConnectionType::Inlet,
NodeInputManager::CompFluidStream::Primary,
DataLoopNode::ObjectIsParent);
if (NodeNum > 0 && num <= thisSplitter.numOfOutletNodes) {
thisSplitter.OutletNodeName.push_back(name);
thisSplitter.OutletNodeNum.push_back(NodeNum);
Expand Down
2 changes: 2 additions & 0 deletions src/EnergyPlus/BranchNodeConnections.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ constexpr std::array<std::string_view, static_cast<int>(DataLoopNode::Connection
"AirLoopHVAC:OutdoorAirSystem",
"AirLoopHVAC:ReturnPath",
"AirLoopHVAC:ReturnPlenum",
"AirLoopHVAC:Splitter",
"AirLoopHVAC:SupplyPath",
"AirLoopHVAC:SupplyPlenum",
"AirLoopHVAC:Unitary:Furnace:HeatCool",
Expand Down Expand Up @@ -367,6 +368,7 @@ constexpr std::array<std::string_view, static_cast<int>(DataLoopNode::Connection
"AIRLOOPHVAC:OUTDOORAIRSYSTEM",
"AIRLOOPHVAC:RETURNPATH",
"AIRLOOPHVAC:RETURNPLENUM",
"AIALOOPHVAC:SPLITTER",
"AIRLOOPHVAC:SUPPLYPATH",
"AIRLOOPHVAC:SUPPLYPLENUM",
"AIRLOOPHVAC:UNITARY:FURNACE:HEATCOOL",
Expand Down
1 change: 1 addition & 0 deletions src/EnergyPlus/DataLoopNode.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ namespace DataLoopNode {
AirLoopHVACOutdoorAirsystem,
AirLoopHVACReturnPath,
AirLoopHVACReturnPlenum,
AirLoopHVACSplitter,
AirLoopHVACSupplyPath,
AirLoopHVACSupplyPlenum,
AirLoopHVACUnitaryFurnaceHeatCool,
Expand Down
5 changes: 5 additions & 0 deletions tst/EnergyPlus/unit/AirLoopHVACDOAS.unit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11579,6 +11579,11 @@ TEST_F(EnergyPlusFixture, AirLoopHVACDOAS_TestFanDrawThroughPlacement)
EXPECT_NEAR(AirLoopDOAS_SplitterInletNode.MassFlowRate, 0.1, 0.0001);
EXPECT_NEAR(DOAS_FanInletNode.MassFlowRate, 0.1, 0.0001);
EXPECT_NEAR(DOAS_HeatingCOilOutletNode.MassFlowRate, 0.1, 0.0001);

// Issue 10204 Get AirLoopHVAC:Splitter inlet node number using NodeInputManager::GetOnlySingleNode
EXPECT_EQ(thisAirLoopDOASObjec.m_CompPointerAirLoopSplitter->InletNodeNum, 17);
EXPECT_EQ(thisAirLoopDOASObjec.m_CompPointerAirLoopSplitter->OutletNodeNum[0], 2);
EXPECT_EQ(thisAirLoopDOASObjec.m_CompPointerAirLoopMixer->InletNodeNum[0], 18);
}

} // namespace EnergyPlus

5 comments on commit f4cc57c

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

Improved-duct-model (lgu1234) - Win64-Windows-10-VisualStudio-16: Build Failed

Failures:\n

API Test Summary

  • Failed: 10
  • notrun: 5

ConvertInputFormat Test Summary

  • Failed: 4
  • notrun: 1

integration Test Summary

  • Passed: 2
  • Failed: 787

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.

Improved-duct-model (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3586 of 3586 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.

Improved-duct-model (lgu1234) - x86_64-MacOS-10.18-clang-15.0.0: OK (3544 of 3545 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.

Improved-duct-model (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1971 of 1971 tests passed, 0 test warnings)

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

Improved-duct-model (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (790 of 790 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.