Skip to content

Convert UserDefinedComponents to use std::vector #11541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mitchute wants to merge 2 commits into
base: develop
Choose a base branch
from
+434 −449
Open

Convert UserDefinedComponents to use std::vector #11541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31d129c
transition UserDefinedComponents.hh to std::vector from Array1
mitchute Apr 24, 2026
bfa73ff
clarify air connections naming
mitchute Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/EnergyPlus/UnitarySystem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4718,8 +4718,8 @@ namespace UnitarySystems {
// **** How to get this info ****
// UnitarySystem( UnitarySysNum ).DesignHeatingCapacity =
// GetWtoAHPCoilCapacity(CoolingCoilType, this->m_CoolingCoilName, errFlag );
HeatingCoilInletNode = thisHeatCoil.Air(1).InletNodeNum;
HeatingCoilOutletNode = thisHeatCoil.Air(1).OutletNodeNum;
HeatingCoilInletNode = thisHeatCoil.AirConnections[primaryConnIdx].InletNodeNum;
Copy link
Copy Markdown
Collaborator Author

@mitchute mitchute Apr 24, 2026

Choose a reason for hiding this comment

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

UserDefinedComponets.hh has another Air object, so I renamed this for clarity. I also renamed the hardcoded indices for what seems to me like what was intended.

HeatingCoilOutletNode = thisHeatCoil.AirConnections[primaryConnIdx].OutletNodeNum;
}
}

Expand Down Expand Up @@ -5396,8 +5396,8 @@ namespace UnitarySystems {
// **** How to get this info ****
// UnitarySystem( UnitarySysNum ).DesignCoolingCapacity =
// GetWtoAHPCoilCapacity(CoolingCoilType, this->m_CoolingCoilName, errFlag );
CoolingCoilInletNode = thisCoolCoil.Air(1).InletNodeNum;
CoolingCoilOutletNode = thisCoolCoil.Air(1).OutletNodeNum;
CoolingCoilInletNode = thisCoolCoil.AirConnections[primaryConnIdx].InletNodeNum;
CoolingCoilOutletNode = thisCoolCoil.AirConnections[primaryConnIdx].OutletNodeNum;
}
}

Expand Down Expand Up @@ -5432,9 +5432,8 @@ namespace UnitarySystems {
}
}

} else { // IF(.NOT. lAlphaBlanks(16))THEN
} else {
ShowSevereError(state, EnergyPlus::format("{} = {}", cCurrentModuleObject, thisObjectName));
// ShowContinueError(state, format("Illegal {} = {}", cAlphaFields(iCoolingCoilTypeAlphaNum), Alphas(iCoolingCoilTypeAlphaNum)));
errorsFound = true;
}

Expand Down Expand Up @@ -5714,9 +5713,9 @@ namespace UnitarySystems {
errFlag = false;
} else {
auto const &thisSuppCoil = state.dataUserDefinedComponents->UserCoil(this->m_SuppHeatCoilIndex);
SupHeatCoilInletNode = thisSuppCoil.Air(1).InletNodeNum;
SupHeatCoilInletNode = thisSuppCoil.AirConnections[primaryConnIdx].InletNodeNum;
this->m_SuppCoilAirInletNode = SupHeatCoilInletNode;
SupHeatCoilOutletNode = thisSuppCoil.Air(1).OutletNodeNum;
SupHeatCoilOutletNode = thisSuppCoil.AirConnections[primaryConnIdx].OutletNodeNum;
this->SuppCoilOutletNodeNum = SupHeatCoilOutletNode;
}
}
Expand Down
Loading