Skip to content

Commit

Permalink
Merge branch 'develop' into MultispeedFans
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Jul 6, 2023
2 parents 9c8a271 + 8282392 commit 47bc2ce
Show file tree
Hide file tree
Showing 171 changed files with 7,253 additions and 9,169 deletions.
28 changes: 14 additions & 14 deletions src/EnergyPlus/AirLoopHVACDOAS.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ namespace AirLoopHVACDOAS {
++AirLoopMixerNum;
AirLoopMixer thisMixer;

thisMixer.name = UtilityRoutines::MakeUPPERCase(thisObjectName);
thisMixer.OutletNodeName = UtilityRoutines::MakeUPPERCase(fields.at("outlet_node_name").get<std::string>());
thisMixer.name = UtilityRoutines::makeUPPER(thisObjectName);
thisMixer.OutletNodeName = UtilityRoutines::makeUPPER(fields.at("outlet_node_name").get<std::string>());
thisMixer.m_AirLoopMixer_Num = AirLoopMixerNum - 1;
thisMixer.OutletNodeNum = NodeInputManager::GetOnlySingleNode(state,
thisMixer.OutletNodeName,
Expand All @@ -245,7 +245,7 @@ namespace AirLoopHVACDOAS {
int num = 0;
for (auto const &NodeDOASName : NodeArray) {
num += 1;
std::string name = UtilityRoutines::MakeUPPERCase(NodeDOASName.at("inlet_node_name").get<std::string>());
std::string name = UtilityRoutines::makeUPPER(NodeDOASName.at("inlet_node_name").get<std::string>());
int NodeNum = UtilityRoutines::FindItemInList(name, state.dataLoopNodes->NodeID);
if (NodeNum > 0 && num <= thisMixer.numOfInletNodes) {
thisMixer.InletNodeName.push_back(name);
Expand Down Expand Up @@ -380,8 +380,8 @@ namespace AirLoopHVACDOAS {
++AirLoopSplitterNum;
AirLoopSplitter thisSplitter;

thisSplitter.name = UtilityRoutines::MakeUPPERCase(thisObjectName);
thisSplitter.InletNodeName = UtilityRoutines::MakeUPPERCase(fields.at("inlet_node_name").get<std::string>());
thisSplitter.name = UtilityRoutines::makeUPPER(thisObjectName);
thisSplitter.InletNodeName = UtilityRoutines::makeUPPER(fields.at("inlet_node_name").get<std::string>());
thisSplitter.m_AirLoopSplitter_Num = AirLoopSplitterNum - 1;

auto NodeNames = fields.find("nodes");
Expand All @@ -391,7 +391,7 @@ namespace AirLoopHVACDOAS {
int num = 0;
for (auto const &NodeDOASName : NodeArray) {
num += 1;
std::string name = UtilityRoutines::MakeUPPERCase(NodeDOASName.at("outlet_node_name").get<std::string>());
std::string name = UtilityRoutines::makeUPPER(NodeDOASName.at("outlet_node_name").get<std::string>());
int NodeNum = UtilityRoutines::FindItemInList(name, state.dataLoopNodes->NodeID);
if (NodeNum > 0 && num <= thisSplitter.numOfOutletNodes) {
thisSplitter.OutletNodeName.push_back(name);
Expand Down Expand Up @@ -431,9 +431,9 @@ namespace AirLoopHVACDOAS {
++AirLoopDOASNum;
AirLoopDOAS thisDOAS;

thisDOAS.Name = UtilityRoutines::MakeUPPERCase(thisObjectName);
thisDOAS.Name = UtilityRoutines::makeUPPER(thisObjectName);
// get OA and avail num
thisDOAS.OASystemName = UtilityRoutines::MakeUPPERCase(fields.at("airloophvac_outdoorairsystem_name").get<std::string>());
thisDOAS.OASystemName = UtilityRoutines::makeUPPER(fields.at("airloophvac_outdoorairsystem_name").get<std::string>());
thisDOAS.m_OASystemNum = UtilityRoutines::FindItemInList(thisDOAS.OASystemName, state.dataAirLoop->OutsideAirSys);
if (thisDOAS.m_OASystemNum == 0) {
cFieldName = "AirLoopHVAC:OutdoorAirSystem Name";
Expand Down Expand Up @@ -466,8 +466,8 @@ namespace AirLoopHVACDOAS {
bool InletNodeErrFlag = false;
bool OutletNodeErrFlag = false;

const std::string typeNameUC = UtilityRoutines::MakeUPPERCase(thisOutsideAirSys.ComponentType(CompNum));
ValidEquipListType foundType = static_cast<ValidEquipListType>(getEnumerationValue(validEquipNamesUC, typeNameUC));
const std::string typeNameUC = UtilityRoutines::makeUPPER(thisOutsideAirSys.ComponentType(CompNum));
ValidEquipListType foundType = static_cast<ValidEquipListType>(getEnumValue(validEquipNamesUC, typeNameUC));

switch (foundType) {
case ValidEquipListType::OutdoorAirMixer:
Expand Down Expand Up @@ -713,7 +713,7 @@ namespace AirLoopHVACDOAS {
thisDOAS.m_HeatExchangerFlag = true;
}

thisDOAS.AvailManagerSchedName = UtilityRoutines::MakeUPPERCase(fields.at("availability_schedule_name").get<std::string>());
thisDOAS.AvailManagerSchedName = UtilityRoutines::makeUPPER(fields.at("availability_schedule_name").get<std::string>());
thisDOAS.m_AvailManagerSchedPtr = ScheduleManager::GetScheduleIndex(state, thisDOAS.AvailManagerSchedName);
if (thisDOAS.m_AvailManagerSchedPtr == 0) {
cFieldName = "Availability Schedule Name";
Expand All @@ -723,7 +723,7 @@ namespace AirLoopHVACDOAS {
errorsFound = true;
}

thisDOAS.AirLoopMixerName = UtilityRoutines::MakeUPPERCase(fields.at("airloophvac_mixer_name").get<std::string>()); //
thisDOAS.AirLoopMixerName = UtilityRoutines::makeUPPER(fields.at("airloophvac_mixer_name").get<std::string>()); //
thisDOAS.m_AirLoopMixerIndex = getAirLoopMixerIndex(state, thisDOAS.AirLoopMixerName);
if (thisDOAS.m_AirLoopMixerIndex < 0) {
cFieldName = "AirLoopHVAC:Mixer Name";
Expand All @@ -733,7 +733,7 @@ namespace AirLoopHVACDOAS {
}
AirLoopMixer thisAirLoopMixer;
thisDOAS.m_CompPointerAirLoopMixer = thisAirLoopMixer.factory(state, thisDOAS.m_AirLoopMixerIndex, thisDOAS.AirLoopMixerName);
thisDOAS.AirLoopSplitterName = UtilityRoutines::MakeUPPERCase(fields.at("airloophvac_splitter_name").get<std::string>()); //
thisDOAS.AirLoopSplitterName = UtilityRoutines::makeUPPER(fields.at("airloophvac_splitter_name").get<std::string>()); //
thisDOAS.m_AirLoopSplitterIndex = getAirLoopSplitterIndex(state, thisDOAS.AirLoopSplitterName);
if (thisDOAS.m_AirLoopSplitterIndex < 0) {
cFieldName = "AirLoopHVAC:Splitter Name";
Expand Down Expand Up @@ -766,7 +766,7 @@ namespace AirLoopHVACDOAS {
auto const &AirLoopArray = AirLoopNames.value();
int num = 0;
for (auto const &AirLoopHVACName : AirLoopArray) {
std::string name = UtilityRoutines::MakeUPPERCase(AirLoopHVACName.at("airloophvac_name").get<std::string>());
std::string name = UtilityRoutines::makeUPPER(AirLoopHVACName.at("airloophvac_name").get<std::string>());
int LoopNum = UtilityRoutines::FindItemInList(name, state.dataAirSystemsData->PrimaryAirSystems);
num += 1;
if (LoopNum > 0 && num <= thisDOAS.NumOfAirLoops) {
Expand Down
Loading

5 comments on commit 47bc2ce

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

MultispeedFans (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.3: OK (3442 of 3483 tests passed, 98 test warnings)

Messages:\n

  • 32 tests had: AUD diffs.
  • 34 tests had: MTD diffs.
  • 79 tests had: RDD diffs.
  • 2 tests had: EDD diffs.
  • 17 tests had: MDD diffs.
  • 13 tests had: Table big diffs.
  • 1 test had: ERR diffs.

Failures:\n

regression Test Summary

  • Passed: 753
  • Failed: 41

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.

MultispeedFans (lgu1234) - x86_64-MacOS-10.17-clang-13.0.0: OK (3401 of 3442 tests passed, 98 test warnings)

Messages:\n

  • 32 tests had: AUD diffs.
  • 34 tests had: MTD diffs.
  • 79 tests had: RDD diffs.
  • 2 tests had: EDD diffs.
  • 17 tests had: MDD diffs.
  • 13 tests had: Table big diffs.
  • 1 test had: ERR diffs.

Failures:\n

regression Test Summary

  • Passed: 733
  • Failed: 41

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.

MultispeedFans (lgu1234) - Win64-Windows-10-VisualStudio-16: OK (2667 of 2667 tests passed, 0 test warnings)

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.

MultispeedFans (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.3-UnitTestsCoverage-Debug: OK (1892 of 1892 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.

MultispeedFans (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.3-IntegrationCoverage-Debug: OK (778 of 778 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.