Merge pull request #4843 from NREL/issue-4837

Fix #4837 - Geometry improvements - Detect incorrectly oriented surfaces in spaces, non convex spaces
NREL · Jun 29, 2023 · 26de116 · 26de116
2 parents a69c2cb + e03d083
commit 26de116
Show file tree

Hide file tree

Showing 40 changed files with 9,075 additions and 446 deletions.
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -174,6 +174,7 @@ set(model_resources_src
   model/ParkUnder_Retail_Office_C2.osm
   model/ASHRAECourthouse.osm
   model/A205ExampleChiller.RS0001.a205.cbor
+  model/4837_SpaceVolume.osm
 )
 
 

diff --git a/resources/model/4837_SpaceVolume.osm b/resources/model/4837_SpaceVolume.osm
diff --git a/src/model/PlanarSurface.cpp b/src/model/PlanarSurface.cpp
@@ -28,6 +28,7 @@
 
 #include "../utilities/geometry/Geometry.hpp"
 #include "../utilities/geometry/Transformation.hpp"
+#include "../utilities/geometry/Polyhedron.hpp"
 
 #include "../utilities/core/Assert.hpp"
 
@@ -463,6 +464,14 @@ namespace model {
       return m_cachedPlane.get();
     }
 
+    Surface3d PlanarSurface_Impl::surface3d() const {
+      return {this->vertices(), this->nameString(), 0};
+    }
+
+    bool PlanarSurface_Impl::isConvex() const {
+      return surface3d().isConvex();
+    }
+
     std::vector<std::vector<Point3d>> PlanarSurface_Impl::triangulation() const {
       if (m_cachedTriangulation.empty()) {
         Transformation faceTransformation = Transformation::alignFace(this->vertices());
@@ -699,6 +708,10 @@ namespace model {
     return getImpl<detail::PlanarSurface_Impl>()->plane();
   }
 
+  bool PlanarSurface::isConvex() const {
+    return getImpl<detail::PlanarSurface_Impl>()->isConvex();
+  }
+
   std::vector<std::vector<Point3d>> PlanarSurface::triangulation() const {
     return getImpl<detail::PlanarSurface_Impl>()->triangulation();
   }

diff --git a/src/model/PlanarSurface.hpp b/src/model/PlanarSurface.hpp
@@ -199,6 +199,8 @@ namespace model {
     /// Returns any SurfacePropertyConvectionCoefficients associated with this surface, does not return SurfacePropertyConvectionCoefficientsMultipleSurface.
     std::vector<SurfacePropertyConvectionCoefficients> surfacePropertyConvectionCoefficients() const;
 
+    bool isConvex() const;
+
    protected:
     /** @name Constructors and Destructors */
     //@{

diff --git a/src/model/PlanarSurface_Impl.hpp b/src/model/PlanarSurface_Impl.hpp
@@ -16,6 +16,8 @@
 
 namespace openstudio {
 
+class Surface3d;
+
 namespace model {
 
   class PlanarSurfaceGroup;
@@ -130,6 +132,10 @@ namespace model {
 
       Plane plane() const;
 
+      Surface3d surface3d() const;
+
+      bool isConvex() const;
+
       std::vector<std::vector<Point3d>> triangulation() const;
 
       Point3d centroid() const;