Initializes nrcan_446 branch: skylights & wells

lib/openstudio-standards/standards/necb/NECB2011/building_envelope.rb

@@ -776,6 +776,7 @@ def apply_max_srr_nrcan(model:, srr_lim:, srr_opt: '')
         sub_surface_create_scaled_subsurfaces_from_surface(surface: roof, area_fraction: srr_lim, construction: skylight_construct_set)
       end
     else # OPTION B
+      TBD.clean!
       spaces = model.getSpaces
       types  = model.getSpaceTypes
       roofs  = TBD.facets(spaces, "Outdoors", "RoofCeiling")
@@ -810,7 +811,7 @@ def apply_max_srr_nrcan(model:, srr_lim:, srr_opt: '')
       # the requested skylight area, often by 10% to 15%. This makes it unfair
       # for NECBs, and more challenging when dealing with skylight wells. This
       # issue only applies with attics - not plenums. Trim down SRR if required.
-      target = (srr_lim * graX / gra0) * graX
+      target = (srr_lim * graX / gra0) * gra0
 
       # Filtering out tiny roof surfaces, twisty corridors, etc.
       types = types.reject { |tp| tp.nameString.downcase.include?("undefined") }
@@ -827,6 +828,7 @@ def apply_max_srr_nrcan(model:, srr_lim:, srr_opt: '')
       spaces = spaces.select { |sp| types.include?(sp.spaceType.get) }
 
       TBD.addSkyLights(spaces, {area: target})
+      self.osut[:logs] = TBD.logs
 
       skys = TBD.facets(model.getSpaces, "Outdoors", "Skylight")
       skm2 = skys.sum(&:grossArea)

lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb

@@ -301,7 +301,7 @@ def model_create_prototype_model(template:,
         space.additionalProperties.setFeature(tag, "nonresconditioned")
       else
         if space.nameString.downcase.include?("attic")
-            space.additionalProperties.setFeature(tag, "unconditioned")
+          space.additionalProperties.setFeature(tag, "unconditioned")
         else # treat all other cases as indirectly-conditioned e.g. plenums
           space.additionalProperties.setFeature(tag, "nonresconditioned")
         end

test/necb/unit_tests/tests/test_necb_skylights.rb

@@ -37,12 +37,12 @@ def test_necb_skylights()
       'MediumOffice',
       # 'NorthernEducation',
       'QuickServiceRestaurant',
-      # 'SmallOffice'
+      'SmallOffice'
     ]
 
     # NOTE: Skipping NorthernEducation for now:
-    #   - Standards.Model.rb:5432: warning: instance variable @space_type_map not initialized
-    #   - model works in isolation (e.g. SDK 3.6.1, 3.7.0, 3.8.0)
+    #   Minitest::UnexpectedError: RuntimeError: validation of model failed.
+    #   ... /openstudio-standards/lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb:714:in `apply_loads'
 
     # Range of test options. NECB2011 for now. Skipping later NECBs - they're
     # systematically easier to deploy, given their lower reference building SRR
@@ -60,7 +60,6 @@ def test_necb_skylights()
         @buildings.sort.each   do |building|
           @templates.sort.each do |template|
             cas = "CASE #{option} | #{building} (#{template})"
-            puts; puts; puts cas; puts "--- --- --- --- --- -- ---"
             srr = case template
                   when 'NECB2020' then 0.02
                   when 'NECB2017' then 0.02
@@ -142,8 +141,6 @@ def test_necb_skylights()
             # e.g. larger building footprint, wider overhangs.
             ratio = gra0.round > graX.round ? skm2 / graX : skm2 / gra0
 
-            puts; puts "#{gra0.round} vs #{graX.round} #{skm2.round}"; puts
-
             assert(ratio.round(2) == srr, "BTAP/OSut: Incorrect SRR (#{cas})?")
 
             # Higher level feedback.