Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/model/ControllerMechanicalVentilation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,13 @@ namespace model {
if (oaSystem) {
const auto airLoop = oaSystem->airLoopHVAC();
if (airLoop) {
const auto sizingSystem = airLoop->sizingSystem();
result = sizingSystem.systemOutdoorAirMethod();
const auto sizingSystemOAMethod = airLoop->sizingSystem().systemOutdoorAirMethod();
const auto possible_vals = systemOutdoorAirMethodValues();
if (std::find_if(possible_vals.cbegin(), possible_vals.cend(),
[&sizingSystemOAMethod](const std::string& val) { return openstudio::istringEqual(val, sizingSystemOAMethod); })
!= possible_vals.cend()) {
result = sizingSystemOAMethod;
}
Comment on lines +112 to +118
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Simple fix: do not inherit the SizingSystem's System Outdoor Air Method value if this option isn't one available in Controller:MV.

image

}
}
}
Expand Down
40 changes: 37 additions & 3 deletions src/model/test/ControllerMechanicalVentilation_GTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "../AirLoopHVACOutdoorAirSystem.hpp"
#include "../DesignSpecificationOutdoorAir.hpp"
#include "../Node.hpp"
#include "../SizingSystem.hpp"
#include "../Space.hpp"
#include "../ThermalZone.hpp"

Expand All @@ -34,9 +35,42 @@ TEST_F(ModelFixture, ControllerMechanicalVentilation) {
TEST_F(ModelFixture, ControllerMechanicalVentilation_SystemOutdoorAirMethod) {

Model m;
ControllerMechanicalVentilation c(m);
EXPECT_TRUE(c.isSystemOutdoorAirMethodDefaulted());
EXPECT_EQ("Standard62.1VentilationRateProcedure", c.systemOutdoorAirMethod());
ControllerMechanicalVentilation controller_mv(m);
EXPECT_TRUE(controller_mv.isSystemOutdoorAirMethodDefaulted());
EXPECT_EQ("Standard62.1VentilationRateProcedure", controller_mv.systemOutdoorAirMethod());

ControllerOutdoorAir controller_oa(m);
EXPECT_TRUE(controller_oa.setControllerMechanicalVentilation(controller_mv));
EXPECT_TRUE(controller_mv.isSystemOutdoorAirMethodDefaulted());
EXPECT_EQ("Standard62.1VentilationRateProcedure", controller_mv.systemOutdoorAirMethod());

AirLoopHVACOutdoorAirSystem oa_system(m, controller_oa);
EXPECT_EQ("Standard62.1VentilationRateProcedure", controller_mv.systemOutdoorAirMethod());

AirLoopHVAC a(m);
auto sz = a.sizingSystem();

auto supplyInletNode = a.supplyInletNode();
EXPECT_TRUE(oa_system.addToNode(supplyInletNode));

// System Outdoor Air Method is common to both ControllerMechanicalVentilation and SizingSystem
EXPECT_TRUE(sz.setSystemOutdoorAirMethod("ZoneSum"));
EXPECT_TRUE(controller_mv.isSystemOutdoorAirMethodDefaulted());
EXPECT_EQ("ZoneSum", controller_mv.systemOutdoorAirMethod());

// System Outdoor Air Method is NOT common to both ControllerMechanicalVentilation and SizingSystem
EXPECT_TRUE(sz.setSystemOutdoorAirMethod("Standard62.1SimplifiedProcedure"));
EXPECT_TRUE(controller_mv.isSystemOutdoorAirMethodDefaulted());
EXPECT_EQ("Standard62.1VentilationRateProcedure", controller_mv.systemOutdoorAirMethod());
Comment on lines +61 to +64
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Before fix

[ RUN      ] ModelFixture.ControllerMechanicalVentilation_SystemOutdoorAirMethod
/media/DataExt4/Software/Others/OpenStudio3/src/model/test/ControllerMechanicalVentilation_GTest.cpp:64: Failure
Expected equality of these values:
  "Standard62.1VentilationRateProcedure"
  controller_mv.systemOutdoorAirMethod()
    Which is: "Standard62.1SimplifiedProcedure"


// Explicitly set the System Outdoor Air Method on the ControllerMechanicalVentilation
// => takes precedence over SizingSystem even if that method is common to both
EXPECT_TRUE(sz.setSystemOutdoorAirMethod("ZoneSum"));
EXPECT_TRUE(controller_mv.isSystemOutdoorAirMethodDefaulted());
EXPECT_EQ("ZoneSum", controller_mv.systemOutdoorAirMethod());
controller_mv.setSystemOutdoorAirMethod("ProportionalControlBasedOnOccupancySchedule");
EXPECT_FALSE(controller_mv.isSystemOutdoorAirMethodDefaulted());
EXPECT_EQ("ProportionalControlBasedOnOccupancySchedule", controller_mv.systemOutdoorAirMethod());
}

TEST_F(ModelFixture, ControllerMechanicalVentilation_hasZonesWithDesignSpecificationOutdoorAir) {
Expand Down