Skip to content

Volume, CeilingHeight, FloorArea for Space object, try 2 #4697

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
jmarrec merged 4 commits into from
Sep 28, 2022
Merged

Volume, CeilingHeight, FloorArea for Space object, try 2 #4697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dafe882
Only FT new space fields if hard set.
joseph-robertson Sep 27, 2022
35a09b2
Clean up new ft.
joseph-robertson Sep 27, 2022
550efdd
Update space ft tests.
joseph-robertson Sep 27, 2022
2536fd4
use if not isXXXDefaulted => setDouble(index, mo.xXX())
jmarrec Sep 28, 2022
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: 12 additions & 3 deletions src/energyplus/ForwardTranslator/ForwardTranslateSpace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include "../../model/InteriorPartitionSurfaceGroup.hpp"
#include "../../model/Surface.hpp"

#include <utilities/idd/OS_Space_FieldEnums.hxx>
#include <utilities/idd/Space_FieldEnums.hxx>

#include "../../utilities/idd/IddEnums.hpp"
Expand Down Expand Up @@ -86,14 +87,22 @@ namespace energyplus {
idfObject.setString(SpaceFields::ZoneName, thermalZone->name().get());
}

// for CeilingHeight, Volume, FloorArea: only FT if hard set (same logic as for ThermalZone)

// CeilingHeight
idfObject.setDouble(SpaceFields::CeilingHeight, modelObject.ceilingHeight());
if (!modelObject.isCeilingHeightDefaulted()) {
idfObject.setDouble(SpaceFields::CeilingHeight, modelObject.ceilingHeight());
}

// Volume
idfObject.setDouble(SpaceFields::Volume, modelObject.volume());
if (!modelObject.isVolumeDefaulted()) {
idfObject.setDouble(SpaceFields::Volume, modelObject.volume());
}

// FloorArea
idfObject.setDouble(SpaceFields::FloorArea, modelObject.floorArea());
if (!modelObject.isFloorAreaDefaulted()) {
idfObject.setDouble(SpaceFields::FloorArea, modelObject.floorArea());
}

// SpaceType
if (boost::optional<SpaceType> spaceType_ = modelObject.spaceType()) {
Expand Down
6 changes: 4 additions & 2 deletions src/energyplus/Test/Space_GTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ TEST_F(EnergyPlusFixture, ForwardTranslator_Space2) {
Surface floor2(points2, model);

Space space1(model);
EXPECT_TRUE(space1.setFloorArea(1));
Space space2(model);
EXPECT_TRUE(space2.setFloorArea(4));
floor1.setParent(space1);
floor2.setParent(space2);

Expand Down Expand Up @@ -329,8 +331,8 @@ TEST_F(EnergyPlusFixture, Space_exampleModel_Loads) {
std::find_if(spaceNames.begin(), spaceNames.end(), [&i_space](const auto& s) { return openstudio::istringEqual(s, i_space.nameString()); });
EXPECT_NE(spaceNames.end(), it);

// TODO: should we actually write the floor area in this simple case or let E+ figure it out?
EXPECT_EQ(100.0, i_space.getDouble(SpaceFields::FloorArea).get());
// let E+ figure it out
EXPECT_TRUE(i_space.isEmpty(SpaceFields::FloorArea));
}

// There's one SpaceList corresponding to the SpaceType (for load attribution) and it does have the 4 spaces in there
Expand Down