Skip to content

#5547 - Move HPWH air inlet/outlet node naming to model namespace for EMS #5551

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

Merged
joseph-robertson merged 9 commits into from
Dec 15, 2025
Merged

#5547 - Move HPWH air inlet/outlet node naming to model namespace for EMS #5551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
234436d
#5547 - Move HPWH air inlet/outlet node naming to model namespace for…
jmarrec Dec 11, 2025
fd7dee0
switched to develop branch for GHA incremental
Dec 11, 2025
be5e821
Merge branch 'develop' of https://github.com/NREL/OpenStudio into 554…
shorowit Dec 12, 2025
2eb5492
Merge branch 'develop' into 5547-hpwp_node_names
Dec 15, 2025
edbfbfc
Add model and ft tests for WaterHeaterHeatPumpWrappedCondenser.
Dec 15, 2025
67a0bb5
Clean up comments and tests.
Dec 15, 2025
0c2ec60
Try to fix tests.
Dec 15, 2025
1e551d7
More fixes to ft tests.
Dec 15, 2025
a520737
Schedule compressor location for schedule test.
Dec 15, 2025
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
1 change: 1 addition & 0 deletions src/energyplus/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,7 @@ set(${target_name}_test_src
Test/ThermostatSetpointDualSetpoint_GTest.cpp
Test/UnitarySystemPerformanceMultispeed_GTest.cpp
Test/WindowPropertyFrameAndDivider_GTest.cpp
Test/WaterHeaterHeatPumpWrappedCondenser_GTest.cpp
Test/WaterHeaterMixed_GTest.cpp
Test/WaterHeaterSizing_GTest.cpp
Test/WaterHeaterStratified_GTest.cpp
Expand Down
46 changes: 8 additions & 38 deletions src/energyplus/ForwardTranslator/ForwardTranslateWaterHeaterHeatPumpWrappedCondenser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ namespace energyplus {
}
}

std::string airInletNodeName;
std::string airOutletNodeName;
// Logic is in model namespace for these two for EMS, cf #5547
std::string airInletNodeName = modelObject.airInletNodeName();
std::string airOutletNodeName = modelObject.airOutletNodeName();

std::string outdoorAirNodeName;
std::string exhaustAirNodeName;
std::string inletAirZoneName;
Expand All @@ -126,16 +128,12 @@ namespace energyplus {
if (istringEqual(modelObject.fanPlacement(), "DrawThrough")) {
idfObject.setString(WaterHeater_HeatPump_WrappedCondenserFields::FanPlacement, "DrawThrough");

// Depending on inletAirConfiguration, what this returns will be different
// * "ZoneAirOnly" and "ZoneAndOutdoorAir" need to get nodes from the thermal zone
// * "OutdoorAirOnly" and "Schedule", it just constructs a node name.
// This is helpful if you need to control this via EMS
if (istringEqual(inletAirConfiguration, "ZoneAirOnly")) {
if (auto thermalZone = modelObject.thermalZone()) {
auto inletNode = modelObject.inletNode();
OS_ASSERT(inletNode);
airInletNodeName = inletNode->name().get();

auto outletNode = modelObject.outletNode();
OS_ASSERT(outletNode);
airOutletNodeName = outletNode->name().get();

inletAirZoneName = thermalZone->name().get();
fanInletNodeName = modelObject.name().get() + " Evap Outlet - Fan Inlet";
fanOutletNodeName = airOutletNodeName;
Expand All @@ -144,14 +142,6 @@ namespace energyplus {
}
} else if (istringEqual(inletAirConfiguration, "ZoneAndOutdoorAir")) {
if (auto thermalZone = modelObject.thermalZone()) {
auto inletNode = modelObject.inletNode();
OS_ASSERT(inletNode);
airInletNodeName = inletNode->name().get();

auto outletNode = modelObject.outletNode();
OS_ASSERT(outletNode);
airOutletNodeName = outletNode->name().get();

outdoorAirNodeName = modelObject.name().get() + " Outdoor Air";
exhaustAirNodeName = modelObject.name().get() + " Exhaust Air";
inletAirZoneName = thermalZone->name().get();
Expand All @@ -170,8 +160,6 @@ namespace energyplus {
evapInletNodeName = outdoorAirNodeName;
evapOutletNodeName = fanInletNodeName;
} else if (istringEqual(inletAirConfiguration, "Schedule")) {
airInletNodeName = modelObject.name().get() + " Inlet";
airOutletNodeName = modelObject.name().get() + " Outlet";
fanInletNodeName = modelObject.name().get() + " Evap Outlet - Fan Inlet";
fanOutletNodeName = airOutletNodeName;
evapInletNodeName = airInletNodeName;
Expand All @@ -183,14 +171,6 @@ namespace energyplus {

if (istringEqual(inletAirConfiguration, "ZoneAirOnly")) {
if (auto thermalZone = modelObject.thermalZone()) {
auto inletNode = modelObject.inletNode();
OS_ASSERT(inletNode);
airInletNodeName = inletNode->name().get();

auto outletNode = modelObject.outletNode();
OS_ASSERT(outletNode);
airOutletNodeName = outletNode->name().get();

inletAirZoneName = thermalZone->name().get();
fanInletNodeName = airInletNodeName;
fanOutletNodeName = modelObject.name().get() + " Fan Outlet - Evap Inlet";
Expand All @@ -199,14 +179,6 @@ namespace energyplus {
}
} else if (istringEqual(inletAirConfiguration, "ZoneAndOutdoorAir")) {
if (auto thermalZone = modelObject.thermalZone()) {
auto inletNode = modelObject.inletNode();
OS_ASSERT(inletNode);
airInletNodeName = inletNode->name().get();

auto outletNode = modelObject.outletNode();
OS_ASSERT(outletNode);
airOutletNodeName = outletNode->name().get();

outdoorAirNodeName = modelObject.name().get() + " Outdoor Air";
exhaustAirNodeName = modelObject.name().get() + " Exhaust Air";
inletAirZoneName = thermalZone->name().get();
Expand All @@ -225,8 +197,6 @@ namespace energyplus {
evapInletNodeName = fanOutletNodeName;
evapOutletNodeName = exhaustAirNodeName;
} else if (istringEqual(inletAirConfiguration, "Schedule")) {
airInletNodeName = modelObject.name().get() + " Inlet";
airOutletNodeName = modelObject.name().get() + " Outlet";
fanInletNodeName = airInletNodeName;
fanOutletNodeName = modelObject.name().get() + " Fan Outlet - Evap Inlet";
evapInletNodeName = fanOutletNodeName;
Expand Down
Loading
Loading