openstudio-standards 0.2.10 → 0.2.11.rc1

data/lib/openstudio-standards/standards/Standards.SpaceType.rb

@@ -183,15 +183,15 @@ class Standard
     lights_have_info = false
     lighting_per_area = space_type_properties['lighting_per_area'].to_f
     lighting_per_person = space_type_properties['lighting_per_person'].to_f
-    lights_frac_to_return_air = space_type_properties['lighting_fraction_to_return_air'].to_f
-    lights_frac_radiant = space_type_properties['lighting_fraction_radiant'].to_f
-    lights_frac_visible = space_type_properties['lighting_fraction_visible'].to_f
+    lights_frac_to_return_air = space_type_properties['lighting_fraction_to_return_air']
+    lights_frac_radiant = space_type_properties['lighting_fraction_radiant']
+    lights_frac_visible = space_type_properties['lighting_fraction_visible']
     lights_frac_replaceable = space_type_properties['lighting_fraction_replaceable'].to_f
-    lights_frac_linear_fluorescent = space_type_properties['lpd_fraction_linear_fluorescent'].to_f
-    lights_frac_compact_fluorescent = space_type_properties['lpd_fraction_compact_fluorescent'].to_f
-    lights_frac_high_bay = space_type_properties['lpd_fraction_high_bay'].to_f
-    lights_frac_specialty_lighting = space_type_properties['lpd_fraction_specialty_lighting'].to_f
-    lights_frac_exit_lighting = space_type_properties['lpd_fraction_exit_lighting'].to_f
+    lights_frac_linear_fluorescent = space_type_properties['lpd_fraction_linear_fluorescent']
+    lights_frac_compact_fluorescent = space_type_properties['lpd_fraction_compact_fluorescent']
+    lights_frac_high_bay = space_type_properties['lpd_fraction_high_bay']
+    lights_frac_specialty_lighting = space_type_properties['lpd_fraction_specialty_lighting']
+    lights_frac_exit_lighting = space_type_properties['lpd_fraction_exit_lighting']
     lights_have_info = true unless lighting_per_area.zero?
     lights_have_info = true unless lighting_per_person.zero?
 
@@ -229,33 +229,15 @@ class Standard
           definition.setWattsperPerson(OpenStudio.convert(lighting_per_person.to_f, 'W/person', 'W/person').get)
           OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set lighting to #{lighting_per_person} W/person.")
         end
-        unless lights_frac_to_return_air.zero?
-          definition.setReturnAirFraction(lights_frac_to_return_air)
-        end
-        unless lights_frac_radiant.zero?
-          definition.setFractionRadiant(lights_frac_radiant)
-        end
-        unless lights_frac_visible.zero?
-          definition.setFractionVisible(lights_frac_visible)
-        end
-        # unless lights_frac_replaceable.zero?
-        #  definition.setFractionReplaceable(lights_frac_replaceable)
-        # end
-        unless lights_frac_linear_fluorescent.zero?
-          definition.additionalProperties.setFeature('lpd_fraction_linear_fluorescent', lights_frac_linear_fluorescent)
-        end
-        unless lights_frac_compact_fluorescent.zero?
-          definition.additionalProperties.setFeature('lpd_fraction_compact_fluorescent', lights_frac_compact_fluorescent)
-        end
-        unless lights_frac_high_bay.zero?
-          definition.additionalProperties.setFeature('lpd_fraction_high_bay', lights_frac_high_bay)
-        end
-        unless lights_frac_specialty_lighting.zero?
-          definition.additionalProperties.setFeature('lpd_fraction_specialty_lighting', lights_frac_specialty_lighting)
-        end
-        unless lights_frac_exit_lighting.zero?
-          definition.additionalProperties.setFeature('lpd_fraction_exit_lighting', lights_frac_exit_lighting)
-        end
+        definition.setReturnAirFraction(lights_frac_to_return_air.to_f) if lights_frac_to_return_air
+        definition.setFractionRadiant(lights_frac_radiant.to_f) if lights_frac_radiant
+        definition.setFractionVisible(lights_frac_visible.to_f) if lights_frac_visible
+        # definition.setFractionReplaceable(lights_frac_replaceable) if lights_frac_replaceable
+        definition.additionalProperties.setFeature('lpd_fraction_linear_fluorescent', lights_frac_linear_fluorescent.to_f) if lights_frac_linear_fluorescent
+        definition.additionalProperties.setFeature('lpd_fraction_compact_fluorescent', lights_frac_compact_fluorescent.to_f) if lights_frac_compact_fluorescent
+        definition.additionalProperties.setFeature('lpd_fraction_high_bay', lights_frac_high_bay.to_f) if lights_frac_high_bay
+        definition.additionalProperties.setFeature('lpd_fraction_specialty_lighting', lights_frac_specialty_lighting.to_f) if lights_frac_specialty_lighting
+        definition.additionalProperties.setFeature('lpd_fraction_exit_lighting', lights_frac_exit_lighting.to_f) if lights_frac_exit_lighting
       end
 
       # If additional lights are specified, add those too
@@ -269,6 +251,13 @@ class Standard
         additional_lights_def.setFractionRadiant(lights_frac_radiant)
         additional_lights_def.setFractionVisible(lights_frac_visible)
 
+        # By default, all additional lighting is specialty lighting
+        additional_lights_def.additionalProperties.setFeature('lpd_fraction_linear_fluorescent', 0.0)
+        additional_lights_def.additionalProperties.setFeature('lpd_fraction_compact_fluorescent', 0.0)
+        additional_lights_def.additionalProperties.setFeature('lpd_fraction_high_bay', 0.0)
+        additional_lights_def.additionalProperties.setFeature('lpd_fraction_specialty_lighting', 1.0)
+        additional_lights_def.additionalProperties.setFeature('lpd_fraction_exit_lighting', 0.0)
+
         # Create the lighting instance and hook it up to the space type
         additional_lights = OpenStudio::Model::Lights.new(additional_lights_def)
         additional_lights.setName("#{space_type.name} Additional Lights")
@@ -280,9 +269,9 @@ class Standard
     # Electric Equipment
     elec_equip_have_info = false
     elec_equip_per_area = space_type_properties['electric_equipment_per_area'].to_f
-    elec_equip_frac_latent = space_type_properties['electric_equipment_fraction_latent'].to_f
-    elec_equip_frac_radiant = space_type_properties['electric_equipment_fraction_radiant'].to_f
-    elec_equip_frac_lost = space_type_properties['electric_equipment_fraction_lost'].to_f
+    elec_equip_frac_latent = space_type_properties['electric_equipment_fraction_latent']
+    elec_equip_frac_radiant = space_type_properties['electric_equipment_fraction_radiant']
+    elec_equip_frac_lost = space_type_properties['electric_equipment_fraction_lost']
     elec_equip_have_info = true unless elec_equip_per_area.zero?
 
     if set_electric_equipment && elec_equip_have_info
@@ -312,15 +301,9 @@ class Standard
           definition.setWattsperSpaceFloorArea(OpenStudio.convert(elec_equip_per_area.to_f, 'W/ft^2', 'W/m^2').get)
           OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set electric EPD to #{elec_equip_per_area} W/ft^2.")
         end
-        unless elec_equip_frac_latent.zero?
-          definition.setFractionLatent(elec_equip_frac_latent)
-        end
-        unless elec_equip_frac_radiant.zero?
-          definition.setFractionRadiant(elec_equip_frac_radiant)
-        end
-        unless elec_equip_frac_lost.zero?
-          definition.setFractionLost(elec_equip_frac_lost)
-        end
+        definition.setFractionLatent(elec_equip_frac_latent.to_f) if elec_equip_frac_latent
+        definition.setFractionRadiant(elec_equip_frac_radiant.to_f) if elec_equip_frac_radiant
+        definition.setFractionLost(elec_equip_frac_lost.to_f) if elec_equip_frac_lost
       end
 
     end
@@ -328,9 +311,9 @@ class Standard
     # Gas Equipment
     gas_equip_have_info = false
     gas_equip_per_area = space_type_properties['gas_equipment_per_area'].to_f
-    gas_equip_frac_latent = space_type_properties['gas_equipment_fraction_latent'].to_f
-    gas_equip_frac_radiant = space_type_properties['gas_equipment_fraction_radiant'].to_f
-    gas_equip_frac_lost = space_type_properties['gas_equipment_fraction_lost'].to_f
+    gas_equip_frac_latent = space_type_properties['gas_equipment_fraction_latent']
+    gas_equip_frac_radiant = space_type_properties['gas_equipment_fraction_radiant']
+    gas_equip_frac_lost = space_type_properties['gas_equipment_fraction_lost']
     gas_equip_have_info = true unless gas_equip_per_area.zero?
 
     if set_gas_equipment && gas_equip_have_info
@@ -360,15 +343,9 @@ class Standard
           definition.setWattsperSpaceFloorArea(OpenStudio.convert(gas_equip_per_area.to_f, 'Btu/hr*ft^2', 'W/m^2').get)
           OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set gas EPD to #{gas_equip_per_area} Btu/hr*ft^2.")
         end
-        unless gas_equip_frac_latent.zero?
-          definition.setFractionLatent(gas_equip_frac_latent)
-        end
-        unless gas_equip_frac_radiant.zero?
-          definition.setFractionRadiant(gas_equip_frac_radiant)
-        end
-        unless gas_equip_frac_lost.zero?
-          definition.setFractionLost(gas_equip_frac_lost)
-        end
+        definition.setFractionLatent(gas_equip_frac_latent.to_f) if gas_equip_frac_latent
+        definition.setFractionRadiant(gas_equip_frac_radiant.to_f) if gas_equip_frac_radiant
+        definition.setFractionLost(gas_equip_frac_lost.to_f) if gas_equip_frac_lost
       end
 
     end

data/lib/openstudio-standards/standards/Standards.SubSurface.rb

@@ -46,7 +46,7 @@ class Standard
       when 'OverheadDoor'
         infil_rate_cfm_per_ft2 = component_infil_rates_cfm_per_ft2[type]['loading_dock_door']
       when 'GlassDoor'
-        OpenStudio.logFree(OpenStudio::Info, 'openstudio.Standards.Model', "For #{sub_surface.name}, assuming swinging_or_revolving_glass_door for infiltration calculation.")
+        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SubSurface', "For #{sub_surface.name}, assuming swinging_or_revolving_glass_door for infiltration calculation.")
         infil_rate_cfm_per_ft2 = component_infil_rates_cfm_per_ft2[type]['swinging_or_revolving_glass_door']
       when 'FixedWindow', 'OperableWindow'
         infil_rate_cfm_per_ft2 = component_infil_rates_cfm_per_ft2[type]['window']
@@ -55,7 +55,7 @@ class Standard
       end
     end
     if infil_rate_cfm_per_ft2.nil?
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.Standards.Model', "For #{sub_surface.name}, could not determine surface type for infiltration, will not be included in calculation.")
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.SubSurface', "For #{sub_surface.name}, could not determine surface type for infiltration, will not be included in calculation.")
       return comp_infil_rate_m3_per_s
     end
 
@@ -241,7 +241,7 @@ class Standard
     surface.vertices.each do |surf_vert|
       surface.vertices.each do |surf_vert_2|
         unless surf_vert_2.z.to_f == surf_vert.z.to_f
-          OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "Currently skylights can only be added to buildings with non-plenum flat roofs.")
+          OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.SubSurface', 'Currently skylights can only be added to buildings with non-plenum flat roofs.')
         end
       end
     end

data/lib/openstudio-standards/standards/Standards.Surface.rb

@@ -57,7 +57,7 @@ class Standard
       end
     end
     if infil_rate_cfm_per_ft2.nil?
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.Standards.Model', "For #{surface.name}, could not determine surface type for infiltration, will not be included in calculation.")
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Surface', "For #{surface.name}, could not determine surface type for infiltration, will not be included in calculation.")
       return comp_infil_rate_m3_per_s
     end
 

data/lib/openstudio-standards/standards/Standards.ThermalZone.rb

@@ -64,7 +64,7 @@ class Standard
     # Convert to cfm
     tot_oa_flow_rate_cfm = OpenStudio.convert(tot_oa_flow_rate, 'm^3/s', 'cfm').get
 
-    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "For #{thermal_zone.name}, design min OA = #{tot_oa_flow_rate_cfm.round} cfm.")
+    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "For #{thermal_zone.name}, design min OA = #{tot_oa_flow_rate_cfm.round} cfm.")
 
     return tot_oa_flow_rate
   end
@@ -254,13 +254,13 @@ class Standard
     end
 
     unless sch_name.nil?
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "Finding space schedules for #{sch_name}.")
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "Finding space schedules for #{sch_name}.")
     end
-    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "The #{spaces.size} spaces have #{occ_schedules_num_occ.size} unique occ schedules.")
+    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "The #{spaces.size} spaces have #{occ_schedules_num_occ.size} unique occ schedules.")
     occ_schedules_num_occ.each do |occ_sch, num_occ|
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "...#{occ_sch.name} - #{num_occ.round} people")
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "...#{occ_sch.name} - #{num_occ.round} people")
     end
-    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "   Total #{max_occ_in_spaces.round} people in #{spaces.size} spaces.")
+    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "   Total #{max_occ_in_spaces.round} people in #{spaces.size} spaces.")
 
     # Store arrays of 365 day schedules used by each occ schedule once for later
     # Store arrays of day schedule times for later
@@ -437,7 +437,7 @@ class Standard
         end
 
         # If here, we need to make a rule to cover from the previous rule to today
-        OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "Making a new rule for #{weekday} from #{end_of_prev_rule} to #{date}")
+        OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "Making a new rule for #{weekday} from #{end_of_prev_rule} to #{date}")
         sch_rule = OpenStudio::Model::ScheduleRule.new(sch_ruleset)
         sch_rule.setName("#{sch_name} #{weekday} Rule")
         day_sch = sch_rule.daySchedule
@@ -630,7 +630,7 @@ class Standard
     elsif htg_fuels.size.zero? && clg_fuels.size.zero?
       fuel_type = 'unconditioned'
     else
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.Standards.Model', "For #{thermal_zone.name}, could not determine fuel type, assuming fossil.  Heating fuels = #{htg_fuels.join(', ')}; cooling fuels = #{clg_fuels.join(', ')}.")
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.Standards.ThermalZone', "For #{thermal_zone.name}, could not determine fuel type, assuming fossil.  Heating fuels = #{htg_fuels.join(', ')}; cooling fuels = #{clg_fuels.join(', ')}.")
       fuel_type = 'fossil'
     end
 
@@ -685,25 +685,25 @@ class Standard
     # Electric and fossil and district
     if htg_fuels.include?('Electricity') && htg_fuels.include?('DistrictHeating') && fossil
       is_mixed = true
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "For #{thermal_zone.name}, heating mixed electricity, fossil, and district.")
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "For #{thermal_zone.name}, heating mixed electricity, fossil, and district.")
     end
 
     # Electric and fossil
     if htg_fuels.include?('Electricity') && fossil
       is_mixed = true
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "For #{thermal_zone.name}, heating mixed electricity and fossil.")
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "For #{thermal_zone.name}, heating mixed electricity and fossil.")
     end
 
     # Electric and district
     if htg_fuels.include?('Electricity') && htg_fuels.include?('DistrictHeating')
       is_mixed = true
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "For #{thermal_zone.name}, heating mixed electricity and district.")
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "For #{thermal_zone.name}, heating mixed electricity and district.")
     end
 
     # Fossil and district
     if fossil && htg_fuels.include?('DistrictHeating')
       is_mixed = true
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.Model', "For #{thermal_zone.name}, heating mixed fossil and district.")
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.Standards.ThermalZone', "For #{thermal_zone.name}, heating mixed fossil and district.")
     end
 
     return is_mixed
@@ -1219,10 +1219,14 @@ class Standard
     # From Table 3.1 Heated Space Criteria
     htg_lim_btu_per_ft2 = 0.0
     case climate_zone
-    when 'ASHRAE 169-2006-1A',
+    when 'ASHRAE 169-2006-0A',
+        'ASHRAE 169-2006-0B',
+        'ASHRAE 169-2006-1A',
         'ASHRAE 169-2006-1B',
         'ASHRAE 169-2006-2A',
         'ASHRAE 169-2006-2B',
+        'ASHRAE 169-2013-0A',
+        'ASHRAE 169-2013-0B',
         'ASHRAE 169-2013-1A',
         'ASHRAE 169-2013-1B',
         'ASHRAE 169-2013-2A',

data/lib/openstudio-standards/standards/Standards.WaterHeaterMixed.rb

@@ -190,7 +190,7 @@ class Standard
 
     # Append the name with standards information
     water_heater_mixed.setName("#{water_heater_mixed.name} #{water_heater_eff.round(3)} Therm Eff")
-    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.WaterHeaterMixed', "For #{template}: #{water_heater_mixed.name}; thermal efficiency = #{water_heater_eff.round(3)}, skin-loss UA = #{ua_btu_per_hr_per_f.round}Btu/hr")
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.WaterHeaterMixed', "For #{template}: #{water_heater_mixed.name}; thermal efficiency = #{water_heater_eff.round(3)}, skin-loss UA = #{ua_btu_per_hr_per_f.round}Btu/hr")
 
     return true
   end

data/lib/openstudio-standards/standards/Standards.ZoneHVACComponent.rb

@@ -1,13 +1,18 @@
 class Standard
   # @!group ZoneHVACComponent
 
+  def zone_hvac_component_prm_baseline_fan_efficacy
+    fan_efficacy_w_per_cfm = 0.3
+    return fan_efficacy_w_per_cfm
+  end
+
   # Sets the fan power of zone level HVAC equipment
-  # (PTACs, PTHPs, Fan Coils, and Unit Heaters)
+  # (Fan coils, Unit Heaters, PTACs, PTHPs, VRF Terminals, WSHPs, ERVs)
   # based on the W/cfm specified in the standard.
   #
   # @return [Bool] returns true if successful, false if not
   def zone_hvac_component_apply_prm_baseline_fan_power(zone_hvac_component)
-    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.model.ZoneHVACComponent', "Setting fan power for #{zone_hvac_component.name}.")
+    OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.ZoneHVACComponent', "Setting fan power for #{zone_hvac_component.name}.")
 
     # Convert this to the actual class type
     zone_hvac = if zone_hvac_component.to_ZoneHVACFourPipeFanCoil.is_initialized
@@ -18,6 +23,12 @@ class Standard
                   zone_hvac_component.to_ZoneHVACPackagedTerminalAirConditioner.get
                 elsif zone_hvac_component.to_ZoneHVACPackagedTerminalHeatPump.is_initialized
                   zone_hvac_component.to_ZoneHVACPackagedTerminalHeatPump.get
+                elsif zone_hvac_component.to_ZoneHVACTerminalUnitVariableRefrigerantFlow.is_initialized
+                  zone_hvac_component.to_ZoneHVACTerminalUnitVariableRefrigerantFlow.get
+                elsif zone_hvac_component.to_ZoneHVACWaterToAirHeatPump.is_initialized
+                  zone_hvac_component.to_ZoneHVACWaterToAirHeatPump.get
+                elsif zone_hvac_component.to_ZoneHVACEnergyRecoveryVentilator.is_initialized
+                  zone_hvac_component.to_ZoneHVACEnergyRecoveryVentilator.get
                 end
 
     # Do nothing for other types of zone HVAC equipment
@@ -26,7 +37,7 @@ class Standard
     end
 
     # Determine the W/cfm
-    fan_efficacy_w_per_cfm = 0.3
+    fan_efficacy_w_per_cfm = zone_hvac_component_prm_baseline_fan_efficacy
 
     # Convert efficacy to metric
     # 1 cfm = 0.0004719 m^3/s
@@ -66,7 +77,7 @@ class Standard
     # Calculate the newly set efficacy
     fan_power_new_w = fan_rise_new_pa * max_air_flow_rate / fan_tot_eff
     fan_efficacy_new_w_per_cfm = fan_power_new_w / max_air_flow_rate_cfm
-    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.ZoneHVACComponent', "For #{zone_hvac_component.name}: fan efficacy set to #{fan_efficacy_new_w_per_cfm.round(2)} W/cfm.")
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.ZoneHVACComponent', "For #{zone_hvac_component.name}: fan efficacy set to #{fan_efficacy_new_w_per_cfm.round(2)} W/cfm.")
 
     return true
   end
@@ -199,7 +210,7 @@ class Standard
     vestibule_htg_mgr.setCallingPoint('BeginTimestepBeforePredictor')
     vestibule_htg_mgr.addProgram(vestibule_htg_prg)
 
-    OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirLoopHVAC', "For #{zone_hvac_component.name}: Vestibule heating control applied, heating disabled below #{htg_lim_f} F.")
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.ZoneHVACComponent', "For #{zone_hvac_component.name}: Vestibule heating control applied, heating disabled below #{htg_lim_f} F.")
 
     return true
   end

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/ashrae_90_1_2004.AirLoopHVAC.rb

@@ -75,7 +75,7 @@ class ASHRAE9012004 < ASHRAE901
       if min_int_area_served_ft2 == infinity_ft2 && min_ext_area_served_ft2 == infinity_ft2
         OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirLoopHVAC', "For #{air_loop_hvac.name}: Economizer not required for climate zone #{climate_zone}.")
       else
-        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirLoopHVAC', "For #{air_loop_hvac.name}: Economizer not required for because the interior area served of #{int_area_served_m2} ft2 < minimum of #{min_int_area_served_m2} and the perimeter area served of #{ext_area_served_m2} ft2 < minimum of #{min_ext_area_served_m2} for climate zone #{climate_zone}.")
+        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirLoopHVAC', "For #{air_loop_hvac.name}: Economizer not required for because the interior area served of #{int_area_served_m2} ft2 is less than the minimum of #{min_int_area_served_m2} and the perimeter area served of #{ext_area_served_m2} ft2 is less than the minimum of #{min_ext_area_served_m2} for climate zone #{climate_zone}.")
       end
       return economizer_required
     end

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/comstock_ashrae_90_1_2004/data/ashrae_90_1.schedules.json

@@ -4140,7 +4140,7 @@
       "name": "Courthouse COURTROOM_OCC_SCH",
       "category": "Occupancy",
       "units": "FRACTION",
-      "day_types": "WtrDsn|SmrDsn",
+      "day_types": "WntrDsn|SmrDsn",
       "start_date": "2018-01-01T00:00:00+00:00",
       "end_date": "2018-12-31T00:00:00+00:00",
       "type": "Hourly",
@@ -250938,7 +250938,7 @@
       "day_types": "Default|WntrDsn|SmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Constant",
+      "type": "Hourly",
       "notes": "From DOE Prototype Buildings",
       "values": [
         0.0,
@@ -271090,7 +271090,7 @@
       "day_types": "Default",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Constant",
+      "type": "Hourly",
       "notes": "From DOE Prototype Buildings",
       "values": [
         0.2210823264,
@@ -282083,7 +282083,7 @@
       "day_types": "Default",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Constant",
+      "type": "Hourly",
       "notes": "From DOE Prototype Buildings",
       "values": [
         0.05,
@@ -317626,7 +317626,7 @@
       "name": "SchoolPrimary KITCHEN_GAS_EQUIP_SCH",
       "category": "Equipment",
       "units": null,
-      "day_types": "DummrySmrDsn",
+      "day_types": "DummySmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Hourly",
@@ -327285,7 +327285,7 @@
       "name": "SchoolSecondary KITCHEN_GAS_EQUIP_SCH",
       "category": "Equipment",
       "units": null,
-      "day_types": "DummrySmrDsn",
+      "day_types": "DummySmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Hourly",
@@ -334295,6 +334295,7 @@
         0.05,
         0.05,
         0.05,
+        0.05,
         0.1,
         0.1,
         0.4,
@@ -336013,7 +336014,7 @@
       "day_types": "SmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Constant",
+      "type": "Hourly",
       "notes": "From AEDG Baseline",
       "values": [
         0.01,
@@ -336685,6 +336686,156 @@
         0.0
       ]
     },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH_2010",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "Default",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Constant",
+      "notes": "From DOE Prototype Buildings",
+      "values": [
+        0.18
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH_2010",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "Sat|Wkdy",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Hourly",
+      "notes": "From DOE Prototype Buildings",
+      "values": [
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.196742,
+        0.359268,
+        0.658658,
+        0.658658,
+        0.658658,
+        0.658658,
+        0.581672,
+        0.658658,
+        0.658658,
+        0.658658,
+        0.658658,
+        0.521794,
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH_2010",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "SmrDsn",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Constant",
+      "notes": "From DOE Prototype Buildings",
+      "values": [
+        1.0
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH_2010",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "WntrDsn",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Constant",
+      "notes": "From DOE Prototype Buildings",
+      "values": [
+        0.0
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH_2013",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "Default",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Constant",
+      "notes": "From DOE Prototype Buildings",
+      "values": [
+        0.18
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH_2013",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "Sat|Wkdy",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Hourly",
+      "notes": "From DOE Prototype Buildings",
+      "values": [
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18788861,
+        0.34310094,
+        0.62901839,
+        0.62901839,
+        0.62901839,
+        0.62901839,
+        0.55549676,
+        0.62901839,
+        0.62901839,
+        0.62901839,
+        0.62901839,
+        0.49831327,
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18,
+        0.18
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH_2013",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "SmrDsn",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Constant",
+      "notes": "From DOE Prototype Buildings",
+      "values": [
+        1.0
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH_2013",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "WntrDsn",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Constant",
+      "notes": "From DOE Prototype Buildings",
+      "values": [
+        0.0
+      ]
+    },
     {
       "name": "Warehouse BLDG_LIGHT_STORAGE_SCH",
       "category": "Lighting",
@@ -337195,7 +337346,7 @@
       "day_types": "Wknd",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Constant",
+      "type": "Hourly",
       "notes": null,
       "values": [
         0.765,