Completes 'Warehouse' addSkylights unittest

Author: brgix

src/osut/osut.py

@@ -7637,9 +7637,9 @@ def addSkyLights(spaces=[], opts=dict) -> float:
             sset["roof"   ] = roof
             sset["space"  ] = space
             sset["m"      ] = space.multiplier()
-            sset["sidelit"] = rooms[space]["sidelit"]
+            sset["sidelit"] = rooms[ide]["sidelit"]
             sset["sloped" ] = isSloped(roof)
-            sset["t0"     ] = rooms[space]["t0"]
+            sset["t0"     ] = rooms[ide]["t0"]
             sset["t"      ] = openstudio.Transformation.alignFace(vtx)
             ssets.append(sset)
 
@@ -7991,11 +7991,11 @@ def addSkyLights(spaces=[], opts=dict) -> float:
                     if round(ly, 2) < round(sp, 2): continue
 
                     if well:
-                        cols = int(round(width / (wxl + sp)), 2)
-                        rows = int(round(depth / (wyl + sp)), 2)
+                        cols = int(round(width / (wxl + sp), 2))
+                        rows = int(round(depth / (wyl + sp), 2))
                     else:
-                        cols = int(round(width / (wx + sp)), 2)
-                        rows = int(round(depth / (wy + sp)), 2)
+                        cols = int(round(width / (wx + sp), 2))
+                        rows = int(round(depth / (wy + sp), 2))
 
                     if cols < 2: continue
                     if rows < 2: continue
@@ -8303,8 +8303,9 @@ def addSkyLights(spaces=[], opts=dict) -> float:
 
         # Favour (large) arrays if meeting residual target, unless constrained.
         if "array" in fpm2:
-            if round(fpm2["array"]["m2"], 2) >= round(dm2, 2):
-                if not fpm2["tight"]: pattern = "array"
+            if dm2 < fpm2["array"]["m2"]:
+                if "tight" not in fpm2["array"] or fpm2["array"]["tight"] is False:
+                    pattern = "array"
 
         if not pattern:
             fpm2 = dict(sorted(fpm2.items(), key=lambda f2: f2[1]["m2"]))
@@ -8684,16 +8685,17 @@ def addSkyLights(spaces=[], opts=dict) -> float:
                 dY = st["dY"]
 
                 for j in range(st["rows"]):
-                    sub            = {}
-                    sub["type"    ] = "Skylight"
-                    sub["count"   ] = st["cols"]
-                    sub["width"   ] = w1
-                    sub["height"  ] = d1
-                    sub["id"      ] = "%s:%d:%d" % (roof.nameString(), i, j)
-                    sub["sill"    ] = dY + j * (2 * dY + d1)
-                    if st["dX"]: sub["r_buffer"] = st["dX"]
-                    if st["dX"]: sub["l_buffer"] = st["dX"]
-                    if frame:    sub["frame"   ] = frame
+                    sub           = {}
+                    sub["type"  ] = "Skylight"
+                    sub["count" ] = st["cols"]
+                    sub["width" ] = w1
+                    sub["height"] = d1
+                    sub["id"    ] = "%s:%d:%d" % (roof.nameString(), i, j)
+                    sub["sill"  ] = dY + j * (2 * dY + d1)
+
+                    if "dX" in st and st["dX"]: sub["r_buffer"] = st["dX"]
+                    if "dX" in st and st["dX"]: sub["l_buffer"] = st["dX"]
+                    if frame: sub["frame"] = frame
 
                     addSubs(roof, sub, False, True, True)
 

tests/test_osut.py

@@ -5283,6 +5283,64 @@ def test34_generated_skylight_wells(self):
         self.assertEqual(o.status(), 0)
         del model
 
+        # --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- #
+        path  = openstudio.path("./tests/files/osms/in/warehouse.osm")
+        model = translator.loadModel(path)
+        self.assertTrue(model)
+        model = model.get()
+
+        for space in model.getSpaces():
+            ide = space.nameString()
+            if not space.partofTotalFloorArea(): continue
+
+            sidelit = osut.isDaylit(space, True, False)
+            toplit  = osut.isDaylit(space, False)
+            if "Office"  in ide: self.assertTrue(sidelit)
+            if "Storage" in ide: self.assertFalse(sidelit)
+            if "Office"  in ide: self.assertFalse(toplit)
+            if "Storage" in ide: self.assertTrue(toplit)
+
+        bulk = model.getSpaceByName("Zone3 Bulk Storage")
+        fine = model.getSpaceByName("Zone2 Fine Storage")
+        self.assertTrue(bulk)
+        self.assertTrue(fine)
+        bulk = bulk.get()
+        fine = fine.get()
+
+        # No overhangs/attics. Calculation of roof area for SRR% is more intuitive.
+        gra_bulk = osut.grossRoofArea(bulk)
+        gra_fine = osut.grossRoofArea(fine)
+
+        bulk_roof_m2 = sum([ruf.grossArea() for ruf in osut.roofs(bulk)])
+        fine_roof_m2 = sum([ruf.grossArea() for ruf in osut.roofs(fine)])
+        self.assertAlmostEqual(gra_bulk, bulk_roof_m2, places=2)
+        self.assertAlmostEqual(gra_fine, fine_roof_m2, places=2)
+
+        # Initial SSR%.
+        bulk_skies = osut.facets(bulk, "Outdoors", "Skylight")
+        sky_area1  = sum([sk.grossArea() for sk in bulk_skies])
+        ratio1     = sky_area1 / bulk_roof_m2
+        self.assertAlmostEqual(sky_area1, 47.57, places=2)
+        self.assertAlmostEqual(ratio1, 0.01, places=2)
+
+        srr  = 0.04
+        opts = {}
+        opts["srr"  ] = srr
+        opts["size" ] = 2.4
+        opts["clear"] = True
+        rm2 = osut.addSkyLights(bulk, opts)
+
+        bulk_skies = osut.facets(bulk, "Outdoors", "Skylight")
+        sky_area2  = sum([sk.grossArea() for sk in bulk_skies])
+        self.assertAlmostEqual(sky_area2, 128.19, places=2)
+        ratio2     = sky_area2 / rm2
+        self.assertAlmostEqual(ratio2, srr, places=2)
+
+        model.save("./tests/files/osms/out/warehouse_sky.osm", True)
+
+        self.assertEqual(o.status(), 0)
+        del model
+
     def test35_facet_retrieval(self):
         o = osut.oslg
         self.assertEqual(o.status(), 0)