Merge branch 'develop' into epw_ground_temps

NREL · Dec 18, 2024 · 14c4ad3 · 14c4ad3
2 parents df7afb7 + f472655
commit 14c4ad3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -773,7 +773,7 @@ if(UNIX)
     set(RADIANCE_PLATFORM "Darwin")
   elseif(EXISTS "/etc/redhat-release")
     # DLM: note that the installer expects the extracted directory to be named radiance-5.0.a.12-Linux
-    set(RADIANCE_EXPECTED_HASH f75898bbfd238a740c1902d385c42b92)
+    set(RADIANCE_EXPECTED_HASH 1e0ef7909c99cd353191d63b085dc6a9)
     set(RADIANCE_PLATFORM "Redhat")
   else()
     set(RADIANCE_EXPECTED_HASH 7b9e4df2b6050fe51c6e138e4c0e6a5a)

diff --git a/resources/model/OpenStudio.idd b/resources/model/OpenStudio.idd
@@ -5138,7 +5138,6 @@ OS:Building,
        \type alpha
        \required-field
        \reference BuildingNames
-       \reference SpaceAndSpaceGroupNames
   A3, \field Building Sector Type
        \deprecated
        \type choice

diff --git a/src/model/test/Model_GTest.cpp b/src/model/test/Model_GTest.cpp
@@ -819,13 +819,13 @@ TEST_F(ModelFixture, Ensure_Name_Unicity_SpaceAndSpaceGroupNames) {
   // Zone, ZoneList, Space, SpaceList all need to be unique names
   Model m;
 
-  std::vector<ModelObject> mos{Space{m}, m.getUniqueModelObject<Building>(), BuildingStory{m}, SpaceType{m}, ThermalZone{m}};
-  EXPECT_EQ(5, m.getObjectsByReference("SpaceAndSpaceGroupNames").size());
+  std::vector<ModelObject> mos{Space{m}, BuildingStory{m}, SpaceType{m}, ThermalZone{m}};
+  EXPECT_EQ(4, m.getObjectsByReference("SpaceAndSpaceGroupNames").size());
 
   std::string name = "A Name";
 
   std::vector<std::pair<size_t, size_t>> combinations{
-    {0, 1}, {0, 2}, {0, 3}, {0, 4}, {1, 2}, {1, 3}, {1, 4}, {2, 3}, {2, 4}, {3, 4},
+    {0, 1}, {0, 2}, {0, 3}, {1, 2}, {1, 3}, {2, 3},
   };
 
   auto resetNames = [&mos]() {