dragonfly-doe2 0.12.12__tar.gz → 0.12.14__tar.gz

{dragonfly_doe2-0.12.12 → dragonfly_doe2-0.12.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragonfly-doe2
-Version: 0.12.12
+Version: 0.12.14
 Summary: Dragonfly extension for the DOE-2 energy simulation engine.
 Home-page: https://github.com/ladybug-tools/dragonfly-doe2
 Author: Ladybug Tools

{dragonfly_doe2-0.12.12 → dragonfly_doe2-0.12.14}/dragonfly_doe2/properties/model.py

@@ -19,7 +19,7 @@ class ModelDoe2Properties(object):
     ERROR_MAP = {
         '030101': 'check_room_2d_floor_plate_vertex_count',
         '030102': 'check_no_room_2d_floor_plate_holes',
-        '030103': 'check_no_story_courtyards'
+        '030103': 'check_story_floor_plates'
     }
 
     def __init__(self, host):
@@ -72,7 +72,7 @@ class ModelDoe2Properties(object):
         # perform checks that are specific to DOE-2
         msgs.append(self.check_room_2d_floor_plate_vertex_count(False, detailed))
         msgs.append(self.check_no_room_2d_floor_plate_holes(False, detailed))
-        msgs.append(self.check_no_story_courtyards(tol, False, detailed))
+        msgs.append(self.check_story_floor_plates(tol, False, detailed))
 
         # output a final report of errors or raise an exception
         full_msgs = [msg for msg in msgs if msg]
@@ -134,7 +134,7 @@ class ModelDoe2Properties(object):
         # perform checks for specific doe-2 simulation rules
         msgs.append(self.check_room_2d_floor_plate_vertex_count(False, detailed))
         msgs.append(self.check_no_room_2d_floor_plate_holes(False, detailed))
-        msgs.append(self.check_no_story_courtyards(tol, False, detailed))
+        msgs.append(self.check_story_floor_plates(tol, False, detailed))
         # output a final report of errors or raise an exception
         full_msgs = [msg for msg in msgs if msg]
         if detailed:
@@ -207,11 +207,11 @@ class ModelDoe2Properties(object):
             raise ValueError(full_msg)
         return full_msg
 
-    def check_no_story_courtyards(
+    def check_story_floor_plates(
             self, tolerance=None, raise_exception=True, detailed=False):
-        """Check that Story floor plates do not contain courtyards.
+        """Check Story floor plates for courtyards and that they are less than 120 vertices.
 
-        EQuest currently has no way to represent such courtyards so, if the issue
+        EQuest currently has no way to represent courtyards so, if the issue
         is not addressed, the courtyards will simply be removed as part of the
         process of exporting to an INP file.
 
@@ -236,8 +236,10 @@ class ModelDoe2Properties(object):
             for story in bldg.unique_stories:
                 floor_geos = [room.floor_geometry for room in story.room_2ds]
                 joined_geos = _grouped_floor_boundary(floor_geos, tolerance)
-                c_count = 0
+                c_count, vert_len = 0, None
                 for geo in joined_geos:
+                    if len(geo.boundary) > 120:
+                        vert_len = len(geo.boundary)
                     if geo.has_holes:
                         for hole in geo.holes:
                             try:
@@ -266,10 +268,26 @@ class ModelDoe2Properties(object):
                             'message': msg
                         }
                     story_msgs.append(msg)
+                if vert_len is not None:
+                    msg = 'Story "{}" has a floor plate with {} vertices, which is more ' \
+                        'than the maximum 120 vertices supported by DOE-2.'.format(
+                            story.display_name, vert_len)
+                    if detailed:
+                        msg = {
+                            'type': 'ValidationError',
+                            'code': '030101',
+                            'error_type': 'Floor Plate Exceeds Maximum Vertex Count',
+                            'extension_type': 'DOE2',
+                            'element_type': 'Room2D',
+                            'element_id': [r.identifier for r in story.room_2ds],
+                            'element_name': [r.display_name for r in story.room_2ds],
+                            'message': msg
+                        }
+                    story_msgs.append(msg)
         if detailed:
             return story_msgs
         if story_msgs != []:
-            msg = 'The following Stories have courtyards in their floor plates' \
+            msg = 'The following Stories have issues with their floor plates' \
                 ':\n{}'.format('\n'.join(story_msgs))
             if raise_exception:
                 raise ValueError(msg)

{dragonfly_doe2-0.12.12 → dragonfly_doe2-0.12.14}/dragonfly_doe2/properties/room2d.py

@@ -143,7 +143,7 @@ class Room2DDoe2Properties(object):
                 raise ValueError(msg)
             full_msg = self.host._validation_message_child(
                 msg, self.host, detailed, '030101', extension='DOE2',
-                error_type='Room Exceeds Maximum Vertex Count')
+                error_type='Floor Plate Exceeds Maximum Vertex Count')
             if detailed:
                 return [full_msg]
             if raise_exception:

{dragonfly_doe2-0.12.12 → dragonfly_doe2-0.12.14}/dragonfly_doe2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragonfly-doe2
-Version: 0.12.12
+Version: 0.12.14
 Summary: Dragonfly extension for the DOE-2 energy simulation engine.
 Home-page: https://github.com/ladybug-tools/dragonfly-doe2
 Author: Ladybug Tools