Building Energy Standards Envelope Requirements Data Update

data/standards/manage_OpenStudio_Standards.rb

@@ -344,8 +344,8 @@ def export_spreadsheet_to_json(spreadsheet_titles, dataset_type: 'os_stds')
     dirs.each { |d| d == 'ALL' ? new_dirs << '*' : new_dirs << "*#{d}*" }
     glob_string = "#{standards_dir}/#{new_dirs.join('/')}"
     puts "--spreadsheet title embedded search criteria: #{glob_string} yields:"
-#    template_dirs = Dir.glob(glob_string).select { |f| File.directory?(f) && !f.include?('data') && !f.include?('prm')}
-    template_dirs = Dir.glob(glob_string).select { |f| File.directory?(f) && !f.include?('data')}
+    template_dirs = Dir.glob(glob_string).select { |f| File.directory?(f) && !f.include?('data') && !f.include?('ashrae_90_1_prm') }
+    # template_dirs = Dir.glob(glob_string).select { |f| File.directory?(f) && !f.include?('data') }
     template_dirs.each do |template_dir|
       puts "----#{template_dir}"
     end

lib/openstudio-standards/schedules/parametric.rb

@@ -1056,7 +1056,7 @@ def self.schedule_ruleset_apply_parametric_inputs(schedule_ruleset, ramp_frequen
             remainder = days_to_fill - value[:days_used]
             day_for_rule = days_to_fill - remainder
             if remainder.size < days_to_fill.size
-              autogen_rules[profile_index] = { days_to_fill: day_for_rule, hoo_start: hoo_start, hoo_end: hoo_end}
+              autogen_rules[profile_index] = { days_to_fill: day_for_rule, hoo_start: hoo_start, hoo_end: hoo_end }
             end
             days_to_fill = remainder
           end

lib/openstudio-standards/standards/Standards.PlanarSurface.rb

@@ -94,9 +94,17 @@ def planar_surface_apply_standard_construction(planar_surface, climate_zone, pre
         end
         case stds_type
         when 'Metal Framing', 'Metal Framing with Thermal Break'
-          stds_type = 'Metal framing (all other)'
+          if template == '90.1-2013'
+            stds_type = 'Metal framing, fixed'
+          else
+            stds_type = 'Metal framing (all other)'
+          end
         when 'Non-Metal Framing'
-          stds_type = 'Nonmetal framing (all)'
+          if template == '90.1-2013'
+            stds_type = 'Nonmetal framing, all'
+          else
+            stds_type = 'Nonmetal framing (all)'
+          end
         when 'Any Vertical Glazing'
           stds_type = 'Any Vertical Glazing'
         else

lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/ashrae_90_1_2004.Model.rb

@@ -14,7 +14,7 @@ def model_get_percent_of_surface_range(model, wwr_parameter)
     if intended_surface_type == 'ExteriorWindow' || intended_surface_type == 'GlassDoor'
       wwr = OpenstudioStandards::Geometry.model_get_exterior_window_to_wall_ratio(model)
       if wwr <= 0.1
-        wwr_range['minimum_percent_of_surface'] = 1.0
+        wwr_range['minimum_percent_of_surface'] = 0.0
         wwr_range['maximum_percent_of_surface'] = 10.0
       elsif wwr <= 0.2
         wwr_range['minimum_percent_of_surface'] = 10.001
@@ -27,7 +27,7 @@ def model_get_percent_of_surface_range(model, wwr_parameter)
         wwr_range['maximum_percent_of_surface'] = 40
       else
         wwr_range['minimum_percent_of_surface'] = 40.001
-        wwr_range['maximum_percent_of_surface'] = 100.0
+        wwr_range['maximum_percent_of_surface'] = 50.0
       end
     end
     return wwr_range