openstudio-standards 0.2.12.rc4 → 0.2.13.rc3

data/lib/openstudio-standards/prototypes/common/objects/Prototype.FanOnOff.rb

@@ -99,10 +99,10 @@ class Standard
                         end_use_subcategory: nil)
     fan = OpenStudio::Model::FanOnOff.new(model)
     PrototypeFan.apply_base_fan_variables(fan,
-                                          fan_name:fan_name,
+                                          fan_name: fan_name,
                                           fan_efficiency: fan_efficiency,
                                           pressure_rise: pressure_rise,
-                                          end_use_subcategory:end_use_subcategory)
+                                          end_use_subcategory: end_use_subcategory)
     fan.setMotorEfficiency(motor_efficiency) unless motor_efficiency.nil?
     fan.setMotorInAirstreamFraction(motor_in_airstream_fraction) unless motor_in_airstream_fraction.nil?
     return fan
@@ -117,10 +117,10 @@ class Standard
                                   motor_in_airstream_fraction: nil,
                                   end_use_subcategory: nil)
     # check values to use
-    fan_efficiency = fan_efficiency ? fan_efficiency : fan_json['fan_efficiency']
-    pressure_rise = pressure_rise ? pressure_rise : fan_json['pressure_rise']
-    motor_efficiency = motor_efficiency ? motor_efficiency : fan_json['motor_efficiency']
-    motor_in_airstream_fraction = motor_in_airstream_fraction ? motor_in_airstream_fraction : fan_json['motor_in_airstream_fraction']
+    fan_efficiency ||= fan_json['fan_efficiency']
+    pressure_rise ||= fan_json['pressure_rise']
+    motor_efficiency ||= fan_json['motor_efficiency']
+    motor_in_airstream_fraction ||= fan_json['motor_in_airstream_fraction']
 
     # convert values
     pressure_rise = pressure_rise ? OpenStudio.convert(pressure_rise, 'inH_{2}O', 'Pa').get : nil
@@ -135,5 +135,4 @@ class Standard
                             end_use_subcategory: end_use_subcategory)
     return fan
   end
-
-end
+end

data/lib/openstudio-standards/prototypes/common/objects/Prototype.FanVariableVolume.rb

@@ -130,24 +130,24 @@ class Standard
                                            fan_power_coefficient_4: nil,
                                            fan_power_coefficient_5: nil)
     # check values to use
-    fan_efficiency = fan_efficiency ? fan_efficiency : fan_json['fan_efficiency']
-    pressure_rise = pressure_rise ? pressure_rise : fan_json['pressure_rise']
-    motor_efficiency = motor_efficiency ? motor_efficiency : fan_json['motor_efficiency']
-    motor_in_airstream_fraction = motor_in_airstream_fraction ? motor_in_airstream_fraction : fan_json['motor_in_airstream_fraction']
-    fan_power_minimum_flow_rate_input_method = fan_power_minimum_flow_rate_input_method ? fan_power_minimum_flow_rate_input_method : fan_json['fan_power_minimum_flow_rate_input_method']
-    fan_power_minimum_flow_rate_fraction = fan_power_minimum_flow_rate_fraction ? fan_power_minimum_flow_rate_fraction : fan_json['fan_power_minimum_flow_rate_fraction']
-    fan_power_coefficient_1 = fan_power_coefficient_1 ? fan_power_coefficient_1 : fan_json['fan_power_coefficient_1']
-    fan_power_coefficient_2 = fan_power_coefficient_2 ? fan_power_coefficient_2 : fan_json['fan_power_coefficient_2']
-    fan_power_coefficient_3 = fan_power_coefficient_3 ? fan_power_coefficient_3 : fan_json['fan_power_coefficient_3']
-    fan_power_coefficient_4 = fan_power_coefficient_4 ? fan_power_coefficient_4 : fan_json['fan_power_coefficient_4']
-    fan_power_coefficient_5 = fan_power_coefficient_5 ? fan_power_coefficient_5 : fan_json['fan_power_coefficient_5']
+    fan_efficiency ||= fan_json['fan_efficiency']
+    pressure_rise ||= fan_json['pressure_rise']
+    motor_efficiency ||= fan_json['motor_efficiency']
+    motor_in_airstream_fraction ||= fan_json['motor_in_airstream_fraction']
+    fan_power_minimum_flow_rate_input_method ||= fan_json['fan_power_minimum_flow_rate_input_method']
+    fan_power_minimum_flow_rate_fraction ||= fan_json['fan_power_minimum_flow_rate_fraction']
+    fan_power_coefficient_1 ||= fan_json['fan_power_coefficient_1']
+    fan_power_coefficient_2 ||= fan_json['fan_power_coefficient_2']
+    fan_power_coefficient_3 ||= fan_json['fan_power_coefficient_3']
+    fan_power_coefficient_4 ||= fan_json['fan_power_coefficient_4']
+    fan_power_coefficient_5 ||= fan_json['fan_power_coefficient_5']
 
     # convert values
     pressure_rise_pa = OpenStudio.convert(pressure_rise, 'inH_{2}O', 'Pa').get unless pressure_rise.nil?
 
     # create fan
     fan = create_fan_variable_volume(model,
-                                     fan_name:fan_name,
+                                     fan_name: fan_name,
                                      fan_efficiency: fan_efficiency,
                                      pressure_rise: pressure_rise_pa,
                                      motor_efficiency: motor_efficiency,
@@ -162,5 +162,4 @@ class Standard
                                      fan_power_coefficient_5: fan_power_coefficient_5)
     return fan
   end
-
-end
+end

data/lib/openstudio-standards/prototypes/common/objects/Prototype.FanZoneExhaust.rb

@@ -5,6 +5,9 @@ class Standard
 
   # Sets the fan pressure rise based on the Prototype buildings inputs
   def fan_zone_exhaust_apply_prototype_fan_pressure_rise(fan_zone_exhaust)
+    # Do not modify dummy exhaust fans
+    return true if fan_zone_exhaust.name.to_s.downcase.include? 'dummy'
+
     # All exhaust fans are assumed to have a pressure rise of
     # 0.5 in w.c. in the prototype building models.
     pressure_rise_in_h2o = 0.5
@@ -27,9 +30,9 @@ class Standard
                                         end_use_subcategory: nil)
 
     # check values to use
-    fan_efficiency = fan_efficiency ? fan_efficiency : fan_json['fan_efficiency']
-    pressure_rise = pressure_rise ? pressure_rise : fan_json['pressure_rise']
-    system_availability_manager_coupling_mode = system_availability_manager_coupling_mode ? system_availability_manager_coupling_mode : fan_json['system_availability_manager_coupling_mode']
+    fan_efficiency ||= fan_json['fan_efficiency']
+    pressure_rise ||= fan_json['pressure_rise']
+    system_availability_manager_coupling_mode ||= fan_json['system_availability_manager_coupling_mode']
 
     # convert values
     pressure_rise = pressure_rise ? OpenStudio.convert(pressure_rise, 'inH_{2}O', 'Pa').get : nil
@@ -59,5 +62,4 @@ class Standard
     fan.setSystemAvailabilityManagerCouplingMode(system_availability_manager_coupling_mode) unless system_availability_manager_coupling_mode.nil?
     return fan
   end
-
-end
+end

data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.elevators.rb

@@ -166,6 +166,7 @@ class Standard
     bottom_story = effective_num_stories[:story_hash].keys.first
     bottom_story.spaces.each do |space|
       next if space.multiplier > 1
+
       bottom_spaces[space] = space.floorArea
     end
     target_space = bottom_spaces.key(bottom_spaces.values.max)
@@ -342,6 +343,7 @@ class Standard
                        elevator_hourly_fractions[0]
                      end
         next if value == value_plus
+
         day_schedule.addValue(t, elevator_hourly_fractions[hr])
       end
     end
@@ -412,8 +414,9 @@ class Standard
 
     # check fraction lost on heat from elevator if traction, change to 100% lost if not setup that way.
     if elevator_type == 'Traction'
-      elevator.definition.to_ElectricEquipmentDefinition.get.setFractionLost(1.0)
+      elevator.definition.to_ElectricEquipmentDefinition.get.setFractionLatent(0.0)
       elevator.definition.to_ElectricEquipmentDefinition.get.setFractionRadiant(0.0)
+      elevator.definition.to_ElectricEquipmentDefinition.get.setFractionLost(1.0)
     end
 
     return elevator

data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.exterior_lights.rb

@@ -284,7 +284,6 @@ class Standard
   # @todo - add code in to determine number of entries and canopy area from model geoemtry
   # @todo - come up with better logic for entry widths
   def model_create_exterior_lighting_area_length_count_hash(model, space_type_hash, use_model_for_entries_and_canopies)
-
     # populate building_type_hashes from space_type_hash
     building_type_hashes = {}
     space_type_hash.each do |space_type, hash|

data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.hvac.rb

@@ -1,6 +1,5 @@
 class Standard
   def model_add_hvac(model, building_type, climate_zone, prototype_input, epw_file)
-
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started Adding HVAC')
 
     # Get the list of HVAC systems, as defined for each building in the Prototype.building_name files
@@ -33,17 +32,17 @@ class Standard
         else
           # get num_chillers from prototype_input
           num_chillers = prototype_input['chw_number_chillers']
-          if num_chillers == nil || num_chillers.to_i < 1
+          if num_chillers.nil? || num_chillers.to_i < 1
             num_chillers = 1
           end
           # update num_chillers if specified in @system_to_space_map
-          if system['chw_number_chillers'] !=nil && system['chw_number_chillers'].to_i >0
+          if !system['chw_number_chillers'].nil? && system['chw_number_chillers'].to_i > 0
             num_chillers = system['chw_number_chillers']
           end
 
           # get number_cooling_towers if specified in @system_to_space_map
           number_cooling_towers = 1
-          if system['number_cooling_towers'] !=nil && system['number_cooling_towers'].to_i >0
+          if !system['number_cooling_towers'].nil? && system['number_cooling_towers'].to_i > 0
             number_cooling_towers = system['number_cooling_towers']
           end
 
@@ -133,7 +132,15 @@ class Standard
         # Special logic to make a heat pump loop if necessary
         heat_pump_loop = nil
         if system['heating_type'] == 'Water To Air Heat Pump'
-          heat_pump_loop = model_get_or_add_heat_pump_loop(model, 'NaturalGas', 'Electricity', heat_pump_loop_cooling_type: 'EvaporativeFluidCooler')
+          # @code_sections [90.1-2016_6.5.5.2.1]
+          # change highrise apartment heat rejection fan (< 5hp) from single speed to two speed evaporative fluid cooler
+          # TODO: this is temporary fix, it should be applied to all heat rejection devices smaller than 5hp.
+          if system['heat_pump_loop_cooling_type'].nil?
+            hp_loop_cooling_type = 'EvaporativeFluidCooler'
+          else
+            hp_loop_cooling_type = system['heat_pump_loop_cooling_type']
+          end
+          heat_pump_loop = model_get_or_add_heat_pump_loop(model, 'NaturalGas', 'Electricity', heat_pump_loop_cooling_type: hp_loop_cooling_type)
         end
         # if water to air heat pump is using existing chilled water loop and hot water loop as source
         # get existing loops, and assign heat_pump_cool_loop = chilled_water_loop, heat_pump_heat_loop = hot_water_loop
@@ -159,7 +166,7 @@ class Standard
                            model.getPlantLoopByName('Hot Water Loop').get
                          elsif building_type == 'MediumOffice'
                            nil
-						 elsif building_type == 'MediumOfficeDetailed'
+                         elsif building_type == 'MediumOfficeDetailed'
                            nil
                          else
                            model_add_hw_loop(model,
@@ -196,7 +203,7 @@ class Standard
           chilled_water_loop = model.getPlantLoopByName('Chilled Water Loop').get
         else
           num_chillers = 1
-          if (not system['num_chillers'].nil?) && (system['num_chillers'].to_i > 0)
+          if !system['num_chillers'].nil? && system['num_chillers'].to_i > 0
             num_chillers = system['num_chillers'].to_i
           end
           condenser_water_loop = nil
@@ -248,11 +255,11 @@ class Standard
                            model_add_hw_loop(model, 'NaturalGas')
                          end
         # check inputs
-        doas_type = system['doas_type'] ? system['doas_type'] : 'DOASCV'
-        econo_ctrl_mthd = system['economizer_control_method'] ? system['economizer_control_method'] : 'NoEconomizer'
-        doas_control_strategy = system['doas_control_strategy'] ? system['doas_control_strategy'] : 'NeutralSupplyAir'
-        clg_dsgn_sup_air_temp = system['cooling_design_supply_air_temperature'] ? system['cooling_design_supply_air_temperature'] : 60.0
-        htg_dsgn_sup_air_temp = system['heating_design_supply_air_temperature'] ? system['heating_design_supply_air_temperature'] : 70.0
+        doas_type = system['doas_type'] || 'DOASCV'
+        econo_ctrl_mthd = system['economizer_control_method'] || 'NoEconomizer'
+        doas_control_strategy = system['doas_control_strategy'] || 'NeutralSupplyAir'
+        clg_dsgn_sup_air_temp = system['cooling_design_supply_air_temperature'] || 60.0
+        htg_dsgn_sup_air_temp = system['heating_design_supply_air_temperature'] || 70.0
 
         # for boolean input, this makes sure we get the correct input translation
         if system['include_exhaust_fan'].nil? || true?(system['include_exhaust_fan'])
@@ -286,8 +293,12 @@ class Standard
       when 'DC' # Data Center in Large Office building
         # Retrieve the existing hot water loop or add a new one if necessary.
         hot_water_loop = model_get_or_add_hot_water_loop(model, 'NaturalGas')
-        # Retrieve the existing heat pump loop or add a new one if necessary.
-        heat_pump_loop = model_get_or_add_heat_pump_loop(model, 'NaturalGas', 'Electricity', heat_pump_loop_cooling_type: 'CoolingTowerTwoSpeed')
+
+        # Set heat pump loop cooling type to CoolingTowerTwoSpeed if not specified in system hash
+        heat_pump_loop_cooling_type = system['heat_pump_loop_cooling_type'].nil? ? 'CoolingTowerTwoSpeed' : system['heat_pump_loop_cooling_type']
+
+        heat_pump_loop = model_get_or_add_heat_pump_loop(model, 'NaturalGas', 'Electricity',
+                                                         heat_pump_loop_cooling_type: heat_pump_loop_cooling_type)
         model_add_data_center_hvac(model,
                                    thermal_zones,
                                    hot_water_loop,

data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.rb

@@ -4,11 +4,12 @@ Standard.class_eval do
   def model_create_prototype_model(climate_zone, epw_file, sizing_run_dir = Dir.pwd, debug = false, measure_model = nil)
     building_type = @instvarbuilding_type
     raise 'no building_type!' if @instvarbuilding_type.nil?
+
     model = nil
     # There are no reference models for HighriseApartment and data centers at vintages Pre-1980 and 1980-2004,
     # nor for NECB2011. This is a quick check.
     case @instvarbuilding_type
-    when 'HighriseApartment','SmallDataCenterLowITE','SmallDataCenterHighITE','LargeDataCenterLowITE','LargeDataCenterHighITE','Laboratory','TallBuilding','SuperTallBuilding'
+    when 'HighriseApartment', 'SmallDataCenterLowITE', 'SmallDataCenterHighITE', 'LargeDataCenterLowITE', 'LargeDataCenterHighITE', 'Laboratory', 'TallBuilding', 'SuperTallBuilding'
       if template == 'DOE Ref Pre-1980' || template == 'DOE Ref 1980-2004'
         OpenStudio.logFree(OpenStudio::Error, 'Not available', "DOE Reference models for #{@instvarbuilding_type} at   are not available, the measure is disabled for this specific type.")
         return false
@@ -17,8 +18,6 @@ Standard.class_eval do
       # delete this case statement once the College model is complete
       OpenStudio.logFree(OpenStudio::Error, 'Not available', 'While this release includes data for colleges, this only an early draft and should not be used for anything other that early testing or work to improve the college prototype.')
       return false
-    else
-      # do nothing
     end
     # optionally  determine the climate zone from the epw and stat files.
     if climate_zone == 'NECB HDD Method'
@@ -36,12 +35,15 @@ Standard.class_eval do
     model_add_loads(model)
     model_apply_infiltration_standard(model)
     model_modify_infiltration_coefficients(model, @instvarbuilding_type, climate_zone)
+    model_add_door_infiltration(model, climate_zone)
     model_modify_surface_convection_algorithm(model)
     model_create_thermal_zones(model, @space_multiplier_map)
     model_add_design_days_and_weather_file(model, climate_zone, epw_file)
     model_add_hvac(model, @instvarbuilding_type, climate_zone, @prototype_input, epw_file)
     model_add_constructions(model, @instvarbuilding_type, climate_zone)
+    model_fenestration_orientation(model, climate_zone)
     model_custom_hvac_tweaks(building_type, climate_zone, @prototype_input, model)
+    model_add_transfer_air(model)
     model_add_internal_mass(model, @instvarbuilding_type)
     model_add_swh(model, @instvarbuilding_type, climate_zone, @prototype_input, epw_file)
     model_add_exterior_lights(model, @instvarbuilding_type, climate_zone, @prototype_input)
@@ -52,8 +54,10 @@ Standard.class_eval do
     model.yearDescription.get.setDayofWeekforStartDay('Sunday')
     model.getBuilding.setStandardsBuildingType(building_type)
     model_set_climate_zone(model, climate_zone)
+    model_add_lights_shutoff(model)
     # Perform a sizing model_run(model)
     return false if model_run_sizing_run(model, "#{sizing_run_dir}/SR1") == false
+
     # If there are any multizone systems, reset damper positions
     # to achieve a 60% ventilation effectiveness minimum for the system
     # following the ventilation rate procedure from 62.1
@@ -65,7 +69,7 @@ Standard.class_eval do
     # custom economizer controls
     # For 90.1-2010 Outpatient, AHU1 doesn't have economizer and AHU2 set minimum outdoor air flow rate as 0
     model_modify_oa_controller(model)
-    # For operating room 1&2 in 2010 and 2013, VAV minimum air flow is set by schedule
+    # For operating room 1&2 in 2010, 2013, 2016, and 2019, VAV minimum air flow is set by schedule
     model_reset_or_room_vav_minimum_damper(@prototype_input, model)
     # Apply the HVAC efficiency standard
     model_apply_hvac_efficiency_standard(model, climate_zone)
@@ -111,7 +115,7 @@ Standard.class_eval do
 
     # put contents of new_model into model_to_replace
     model_to_replace.addObjects(new_model.toIdfFile.objects)
-    BTAP::runner_register("Info", "Model name is now #{model_to_replace.building.get.name}.", runner)
+    BTAP.runner_register('Info', "Model name is now #{model_to_replace.building.get.name}.", runner)
   end
 
   # Replaces all objects in the current model
@@ -124,7 +128,7 @@ Standard.class_eval do
     # Take the existing model and remove all the objects
     # (this is cheesy), but need to keep the same memory block
     handles = OpenStudio::UUIDVector.new
-    model.objects.each {|objects| handles << objects.handle}
+    model.objects.each { |objects| handles << objects.handle }
     model.removeObjects(handles)
     model = nil
     if File.dirname(__FILE__)[0] == ':'
@@ -182,6 +186,7 @@ Standard.class_eval do
     if all_space_types_have_standard_space_types
       return space_type_map
     end
+
     return nil
   end
 
@@ -210,6 +215,7 @@ Standard.class_eval do
       space_names.each do |space_name|
         space = model.getSpaceByName(space_name)
         next if space.empty?
+
         space = space.get
         space.setBuildingStory(stub_building_story)
       end
@@ -293,8 +299,6 @@ Standard.class_eval do
     floor_adiabatic_construction.setLayers(floor_layers)
 
     return floor_adiabatic_construction
-
-
   end
 
   # Checks to see if the an adiabatic wall construction has been constructed in an OpenStudio model.
@@ -329,8 +333,6 @@ Standard.class_eval do
     wall_adiabatic_construction.setLayers(wall_layers)
 
     return wall_adiabatic_construction
-
-
   end
 
   # Adds code-minimum constructions based on the building type
@@ -460,6 +462,7 @@ Standard.class_eval do
     if new_lookup_building_type == 'SmallHotel' && template != 'NECB2011'
       model.getBuildingStorys.sort.each do |story|
         next if story.name.get == 'AtticStory'
+
         # puts "story = #{story.name}"
         is_residential = 'No' # default for building story level
         exterior_spaces_area = 0
@@ -468,13 +471,14 @@ Standard.class_eval do
         # calculate the propotion of residential area in exterior spaces, see if this story is residential or not
         story.spaces.each do |space|
           next if space.exteriorWallArea.zero?
+
           space_type = space.spaceType.get
           if space_type.standardsSpaceType.is_initialized
             space_type_name = space_type.standardsSpaceType.get
           end
-          data = standards_lookup_table_first(table_name: 'space_types', search_criteria: {'template' => template,
-                                                                                           'building_type' => new_lookup_building_type,
-                                                                                           'space_type' => space_type_name})
+          data = standards_lookup_table_first(table_name: 'space_types', search_criteria: { 'template' => template,
+                                                                                            'building_type' => new_lookup_building_type,
+                                                                                            'space_type' => space_type_name })
           exterior_spaces_area += space.floorArea
           story_exterior_residential_area += space.floorArea if data['is_residential'] == 'Yes' # "Yes" is residential, "No" or nil is nonresidential
         end
@@ -495,6 +499,7 @@ Standard.class_eval do
     # loop through ceiling surfaces and assign the plenum acoustical tile construction if the adjacent surface is a plenum floor
     model.getSurfaces.each do |surface|
       next unless surface.surfaceType == 'RoofCeiling' && surface.outsideBoundaryCondition == 'Surface'
+
       adj_surface = surface.adjacentSurface.get
       adj_space = adj_surface.space.get
       if adj_space.spaceType.is_initialized && adj_space.spaceType.get.standardsSpaceType.is_initialized
@@ -526,7 +531,6 @@ Standard.class_eval do
   # @param building_type [string] the type of building
   # @return [void]
   def model_set_below_grade_wall_constructions(model, building_type, climate_zone)
-
     # Find ground contact wall building category
     construction_set_data = model_get_construction_set(building_type)
     building_type_category = construction_set_data['exterior_wall_building_category']
@@ -546,7 +550,6 @@ Standard.class_eval do
 
     # iterate through spaces and set any necessary CFactorUndergroundWallConstructions
     model.getSpaces.each do |space|
-
       # Get height of the first below grade wall in this space. Will return nil if none are found.
       below_grade_wall_height = model_get_space_below_grade_wall_height(space)
       next if below_grade_wall_height.nil?
@@ -579,7 +582,6 @@ Standard.class_eval do
   # @param space [OpenStudio::Model::Space] space to determine below grade wall height
   # @return [Numeric, nil]
   def model_get_space_below_grade_wall_height(space)
-
     # find height of first below-grade wall adjacent to the ground
     space.surfaces.each do |surface|
       next unless surface.surfaceType == 'Wall'
@@ -605,20 +607,19 @@ Standard.class_eval do
   # @param building_type [string] the type of building
   # @param climate_zone [string] climate zone as described for prototype models. F-Factor is based on this parameter
   def model_set_floor_constructions(model, building_type, climate_zone)
-
-    #Find ground contact wall building category
+    # Find ground contact wall building category
     construction_set_data = model_get_construction_set(building_type)
     building_type_category = construction_set_data['ground_contact_floor_building_category']
 
     # Find Floor F factor
     floor_construction_properties = model_get_construction_properties(model, 'GroundContactFloor', 'Unheated', building_type_category, climate_zone)
 
-    #If no construction properties are found at all, return and allow code to use default constructions
+    # If no construction properties are found at all, return and allow code to use default constructions
     return if floor_construction_properties.nil?
 
     f_factor_ip = floor_construction_properties['assembly_maximum_f_factor']
 
-    #If no f-factor is found in construction properties, return and allow code to use defaults
+    # If no f-factor is found in construction properties, return and allow code to use defaults
     return if f_factor_ip.nil?
 
     f_factor_si = f_factor_ip * OpenStudio.convert(1.0, 'Btu/ft*h*R', 'W/m*K').get
@@ -659,7 +660,6 @@ Standard.class_eval do
   # @param space[OpenStudio::Model::Space]
   # @return [Numeric, Numeric]
   def model_get_f_floor_geometry(space)
-
     perimeter = 0
 
     floors = []
@@ -673,8 +673,8 @@ Standard.class_eval do
 
     # Raise a warning for any space with more than 1 ground contact floor surface.
     if floors.length > 1
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Model', "Space: #{space.name.to_s} has more than one ground contact floor. FFactorGroundFloorConstruction constructions in this space may be incorrect")
-    elsif floors.empty? #If this space has no ground contact floors, return 0
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Model', "Space: #{space.name} has more than one ground contact floor. FFactorGroundFloorConstruction constructions in this space may be incorrect")
+    elsif floors.empty? # If this space has no ground contact floors, return 0
       return 0, 0
     end
 
@@ -682,10 +682,8 @@ Standard.class_eval do
 
     # cycle through surfaces in space
     space.surfaces.each do |surface|
-
       # find perimeter of floor by finding intersecting outdoor walls and measuring the intersection
       if surface.surfaceType == 'Wall' && surface.outsideBoundaryCondition == 'Outdoors'
-
         perimeter += model_calculate_wall_and_floor_intersection(surface, floor)
       end
     end
@@ -706,7 +704,6 @@ Standard.class_eval do
   # @param floor[OpenStudio::Model::Surface] floor occupying same space as wall. Edges checked for interesections with wall
   # @return [Numeric] returns the intersection/overlap length of the wall and floor of interest
   def model_calculate_wall_and_floor_intersection(wall, floor)
-
     # Used for determining if two points are 'equal' if within this length
     tolerance = 0.0001
 
@@ -719,7 +716,6 @@ Standard.class_eval do
 
     # Iterate through wall edges
     wall_edge_array.each do |wall_edge|
-
       wall_edge_p1 = wall_edge[0]
       wall_edge_p2 = wall_edge[1]
 
@@ -737,14 +733,12 @@ Standard.class_eval do
 
       # If the edge is parallel with the floor and in the same x-y plane as the floor, assume an intersection the
       # length of the wall edge
-      edge_vector = OpenStudio::Vector3d.new(wall_edge_p1-wall_edge_p2)
+      edge_vector = OpenStudio::Vector3d.new(wall_edge_p1 - wall_edge_p2)
       return(edge_vector.length)
-
     end
 
     # If no edges intersected, return 0
     return 0
-
   end
 
   # Returns an array of OpenStudio::Point3D pairs of an OpenStudio::Model::Surface's edges. Used to calculate surface
@@ -752,7 +746,6 @@ Standard.class_eval do
   # @param surface[OpenStudio::Model::Surface] - surface whose edges are being returned
   # @return [Array<Array(OpenStudio::Point3D, OpenStudio::Point3D)>] - array of pair of points describing the line segment of an edge
   def model_get_surface_edges(surface)
-
     vertices = surface.vertices
     n_vertices = vertices.length
 
@@ -764,7 +757,7 @@ Standard.class_eval do
     for edge_counter in 0..n_vertices - 1
 
       # If not the last vertex in surface
-      if edge_counter < n_vertices-1
+      if edge_counter < n_vertices - 1
         edge_array << [vertices[edge_counter], vertices[edge_counter + 1]]
       else # Make index adjustments for final index in vertices array
         edge_array << [vertices[edge_counter], vertices[0]]
@@ -779,7 +772,6 @@ Standard.class_eval do
   # @param building_type [String] the type of building
   # @return [Bool] returns true if successful, false if not
   def model_add_internal_mass(model, building_type)
-
     # Assign a material to all internal mass objects
     material = OpenStudio::Model::StandardOpaqueMaterial.new(model)
     material.setName('Std Wood 6inch')
@@ -808,10 +800,10 @@ Standard.class_eval do
 
     # add internal mass
     # not required for NECB2011
-    unless (template == 'NECB2011') ||
-           (building_type.include?('DataCenter')) ||
+    unless template == 'NECB2011' ||
+           building_type.include?('DataCenter') ||
            ((building_type == 'SmallHotel') &&
-            (template == '90.1-2004' || template == '90.1-2007' || template == '90.1-2010' || template == '90.1-2013' || template == 'NREL ZNE Ready 2017'))
+            (template == '90.1-2004' || template == '90.1-2007' || template == '90.1-2010' || template == '90.1-2013' || template == '90.1-2016' || template == '90.1-2019' || template == 'NREL ZNE Ready 2017'))
       internal_mass_def = OpenStudio::Model::InternalMassDefinition.new(model)
       internal_mass_def.setSurfaceAreaperSpaceFloorArea(2.0)
       internal_mass_def.setConstruction(construction)
@@ -819,6 +811,7 @@ Standard.class_eval do
         # only add internal mass objects to conditioned spaces
         next unless space_cooled?(space)
         next unless space_heated?(space)
+
         internal_mass = OpenStudio::Model::InternalMass.new(internal_mass_def)
         internal_mass.setName("#{space.name} Mass")
         internal_mass.setSpace(space)
@@ -860,13 +853,13 @@ Standard.class_eval do
       end
       space.setThermalZone(zone)
 
-    # Skip thermostat for spaces with no space type
-    next if space.spaceType.empty?
+      # Skip thermostat for spaces with no space type
+      next if space.spaceType.empty?
 
-    # Add a thermostat
-    space_type_name = space.spaceType.get.name.get
-    thermostat_name = space_type_name + ' Thermostat'
-    thermostat = model.getThermostatSetpointDualSetpointByName(thermostat_name)
+      # Add a thermostat
+      space_type_name = space.spaceType.get.name.get
+      thermostat_name = space_type_name + ' Thermostat'
+      thermostat = model.getThermostatSetpointDualSetpointByName(thermostat_name)
       if thermostat.empty?
         OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "Thermostat #{thermostat_name} not found for space name: #{space.name}")
       else
@@ -877,7 +870,7 @@ Standard.class_eval do
           ideal_loads = OpenStudio::Model::ZoneHVACIdealLoadsAirSystem.new(model)
           ideal_loads.addToThermalZone(zone)
         end
-     end
+      end
     end
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished creating thermal zones')
  end
@@ -927,6 +920,7 @@ Standard.class_eval do
         thermal_zone.spaces.each do |space|
           next unless space.spaceType.is_initialized
           next unless space.partofTotalFloorArea
+
           space_type = space.spaceType.get
           next unless space_type.standardsBuildingType.is_initialized
           next unless space_type.standardsSpaceType.is_initialized
@@ -1017,6 +1011,7 @@ Standard.class_eval do
 
             # add exhaust
             next if zones_applied.include?(largest_target_zone) # would only hit this if zone has two space types each requesting makeup air
+
             zone_exhaust_hash = thermal_zone_add_exhaust(largest_target_zone, exhaust_makeup_inputs)
             zones_applied << largest_target_zone
             zone_exhaust_fans.merge!(zone_exhaust_hash)
@@ -1102,6 +1097,136 @@ Standard.class_eval do
     return zone_exhaust_fans
   end
 
+  # Add guestroom vacancy controls
+  #
+  # @code_sections [90.1-2016_6.4.3.3.5]
+  # @param model [OpenStudio::Model::Model] OpenStudio model object
+  # @param building_type [String] Building type
+  # @return [Boolean] Returns true if successful, false otherwise
+  def model_add_guestroom_vacancy_controls(model, building_type)
+    # Guestrooms are currently only included in the small and large hotel prototypes
+    return true unless (building_type == 'LargeHotel') || (building_type == 'SmallHotel')
+
+    # Guestrooms controls only required for 90.1-2016 and onward
+    return true unless (template == '90.1-2016') || (template == '90.1-2019')
+
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started Adding Guestroom Vacancy Controls')
+
+    # Define guestroom vacancy maps
+    # List of all spaces that represent vacant rooms
+    guestroom_vacancy_map = {
+      'LargeHotel' => [
+        'Room_3_Mult19_Flr_3'
+      ],
+      'SmallHotel' => [
+        'GuestRoom101',
+        'GuestRoom102',
+        'GuestRoom201',
+        'GuestRoom215_218',
+        'GuestRoom301',
+        'GuestRoom302_305',
+        'GuestRoom313',
+        'GuestRoom319',
+        'GuestRoom324',
+        'GuestRoom402_405',
+        'GuestRoom406_408',
+        'GuestRoom413',
+        'GuestRoom414'
+      ]
+    }
+
+    # Iterate through spaces and apply for guestroom vacancy controls
+    thermostat_schedules = {}
+    thermostat_schedules['Heating'] = []
+    thermostat_schedules['Cooling'] = []
+    model.getSpaces.sort.each do |space|
+      # Get space name
+      space_name = space.name
+
+      # Get space type
+      space_type = space.spaceType.get
+
+      # Skip space types with no standards building type
+      next if space_type.standardsBuildingType.empty?
+
+      stds_bldg_type = space_type.standardsBuildingType.get
+
+      # Skip space types with no standards space type
+      next if space_type.standardsSpaceType.empty?
+
+      stds_spc_type = space_type.standardsSpaceType.get
+
+      # Skip building types and space types that aren't listed in the guestroom vacancy maps
+      next unless guestroom_vacancy_map.key?(stds_bldg_type)
+      next unless guestroom_vacancy_map[stds_bldg_type].include?(space_name.to_s)
+
+      # Get thermal zone and thermostat schedules associated with space
+      thermal_zone = space.thermalZone.get
+      if thermal_zone.thermostatSetpointDualSetpoint.is_initialized
+        thermostat = thermal_zone.thermostatSetpointDualSetpoint.get
+        if thermostat.heatingSetpointTemperatureSchedule.is_initialized && thermostat.heatingSetpointTemperatureSchedule.get.to_ScheduleRuleset.is_initialized
+          thermostat_schedules['Heating'] << thermostat.heatingSetpointTemperatureSchedule.get.to_ScheduleRuleset.get
+        end
+        if thermostat.coolingSetpointTemperatureSchedule.is_initialized && thermostat.coolingSetpointTemperatureSchedule.get.to_ScheduleRuleset.is_initialized
+          thermostat_schedules['Cooling'] << thermostat.coolingSetpointTemperatureSchedule.get.to_ScheduleRuleset.get
+        end
+      end
+
+      # Get zone equipment fan
+      # Currently prototypes with guestrooms use PTAC and 4PFC
+      # TODO: Implement additional system type (zonal and air loop-based)
+      thermal_zone.equipment.sort.each do |zone_equipment|
+        if zone_equipment.to_ZoneHVACPackagedTerminalAirConditioner.is_initialized
+          equipment = zone_equipment.to_ZoneHVACPackagedTerminalAirConditioner.get
+        elsif zone_equipment.to_ZoneHVACFourPipeFanCoil.is_initialized
+          equipment = zone_equipment.to_ZoneHVACFourPipeFanCoil.get
+        else
+          OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "#{thermal_zone} is not served by either a packaged terminal air-conditioner or four pipe fan coil, vacancy fan schedule has not been adjusted")
+          next
+        end
+
+        # Change fan operation schedule
+        fan = if equipment.supplyAirFan.to_FanConstantVolume.is_initialized
+                equipment.supplyAirFan.to_FanConstantVolume.get
+              elsif equipment.supplyAirFan.to_FanVariableVolume.is_initialized
+                equipment.supplyAirFan.to_FanVariableVolume.get
+              elsif equipment.supplyAirFan.to_FanOnOff.is_initialized
+                equipment.supplyAirFan.to_FanOnOff.get
+        end
+        fan.setAvailabilitySchedule(model_add_schedule(model, 'GuestroomVacantFanSchedule'))
+      end
+
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished Adding Guestroom Vacancy Controls')
+    end
+
+    # Adjust thermostat schedules:
+    # Increase set-up/back to comply with code requirements
+    thermostat_schedules.keys.each do |sch_type|
+      thermostat_schedules[sch_type].uniq.each do |sch|
+        # Skip non-ruleset schedules
+        next if sch.to_ScheduleRuleset.empty?
+
+        # Get schedule modifier
+        case template
+          when '90.1-2016', '90.1-2019'
+            case sch_type
+              when 'Heating'
+                sch_mult = 15.556 / 18.889 # Set thermostat to 15.556
+              when 'Cooling'
+                sch_mult = 26.667 / 23.333 # Set thermostat to 26.667
+              else
+                sch_mult = 1 # No adjustments
+            end
+          else
+            shc_mult = 1 # No adjustments
+        end
+
+        # Modify schedules
+        model_multiply_schedule(model, sch.defaultDaySchedule, sch_mult, 0)
+      end
+    end
+  end
+
   # Adds occupancy sensors to certain space types per
   # the PNNL documentation.
   #
@@ -1110,26 +1235,35 @@ Standard.class_eval do
   # @todo genericize and move this method to Standards.Space
   def model_add_occupancy_sensors(model, building_type, climate_zone)
     # Only add occupancy sensors for 90.1-2010
+    # Currently deactivated for all 90.1 versions
+    # of the prototype because occupancy sensor is
+    # currently modeled using different schedules
+    # hence this code double counts savings from
+    # sensors.
+    # TODO: Move occupancy sensor modeling from
+    # schedule to code.
     case template
-      when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004', '90.1-2004', '90.1-2007'
+      when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004', '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019'
         return true
     end
 
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started Adding Occupancy Sensors')
 
     space_type_reduction_map = {
-        'SecondarySchool' => {'Classroom' => 0.32, 'Restroom' => 0.34, 'Office' => 0.22},
-        'PrimarySchool' => {'Classroom' => 0.32, 'Restroom' => 0.34, 'Office' => 0.22}
+      'SecondarySchool' => { 'Classroom' => 0.32, 'Restroom' => 0.34, 'Office' => 0.22 },
+      'PrimarySchool' => { 'Classroom' => 0.32, 'Restroom' => 0.34, 'Office' => 0.22 }
     }
 
     # Loop through all the space types and reduce lighting operation schedule fractions as-specified
     model.getSpaceTypes.sort.each do |space_type|
       # Skip space types with no standards building type
       next if space_type.standardsBuildingType.empty?
+
       stds_bldg_type = space_type.standardsBuildingType.get
 
       # Skip space types with no standards space type
       next if space_type.standardsSpaceType.empty?
+
       stds_spc_type = space_type.standardsSpaceType.get
 
       # Skip building types and space types that aren't listed in the hash
@@ -1148,6 +1282,7 @@ Standard.class_eval do
       space_type.lights.each do |light|
         # Skip lights that don't have a schedule
         next if light.schedule.empty?
+
         lights_sch = light.schedule.get
         lights_schs[lights_sch.name.to_s] = lights_sch
         lights_sch_names << lights_sch.name.to_s
@@ -1173,13 +1308,14 @@ Standard.class_eval do
         new_lights_sch.scheduleRules.each do |sch_rule|
           model_multiply_schedule(model, sch_rule.daySchedule, red_multiplier, 0.25)
         end
-      end # end of lights_sch_names.uniq.each do
+      end
 
       # Loop through all lights instances, replacing old lights
       # schedules with the reduced schedules.
       space_type.lights.each do |light|
         # Skip lights that don't have a schedule
         next if light.schedule.empty?
+
         old_lights_sch_name = light.schedule.get.name.to_s
         if reduced_lights_schs[old_lights_sch_name]
           light.setSchedule(reduced_lights_schs[old_lights_sch_name])
@@ -1271,8 +1407,6 @@ Standard.class_eval do
     return true
   end
 
-  # add exterior lights
-
   # Changes the infiltration coefficients for the prototype vintages.
   #
   # @param (see #add_constructions)
@@ -1283,7 +1417,7 @@ Standard.class_eval do
     # impacts wind speed, and in turn infiltration
     terrain = 'City'
     case template
-      when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', 'NREL ZNE Ready 2017'
+      when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019', 'NREL ZNE Ready 2017'
         case building_type
           when 'Warehouse'
             terrain = 'Urban'
@@ -1338,10 +1472,8 @@ Standard.class_eval do
   end
 
   # Set up daylight savings
-  #
   def model_add_daylight_savings(model)
-
-    start_date  = '2nd Sunday in March'
+    start_date = '2nd Sunday in March'
     end_date = '1st Sunday in November'
 
     runperiodctrl_daylgtsaving = model.getRunPeriodControlDaylightSavingTime
@@ -1365,7 +1497,7 @@ Standard.class_eval do
     thanksgiving.setName('Thanksgiving')
     thanksgiving.setSpecialDayType('Holiday')
 
-    OpenStudio.logFree(OpenStudio::Info, 'openstudio.prototype.Model', "Added holidays: New Years, Thanksgiving.")
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.prototype.Model', 'Added holidays: New Years, Thanksgiving.')
   end
 
   # Changes the infiltration coefficients for the prototype vintages.
@@ -1388,12 +1520,12 @@ Standard.class_eval do
             clg = 1.33
             htg = 1.33
         end
-      when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
+      when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019'
         # exit if is one of the 90.1 templates as their sizing paramters are explicitly specified in geometry osms
         return
       when 'CBES Pre-1978', 'CBES T24 1978', 'CBES T24 1992', 'CBES T24 2001', 'CBES T24 2005', 'CBES T24 2008'
         case building_type
-          when 'Hospital', 'LargeHotel', 'MediumOffice', 'LargeOffice', 'MediumOfficeDetailed','LargeOfficeDetailed', 'Outpatient', 'PrimarySchool'
+          when 'Hospital', 'LargeHotel', 'MediumOffice', 'LargeOffice', 'MediumOfficeDetailed', 'LargeOfficeDetailed', 'Outpatient', 'PrimarySchool'
             clg = 1.0
             htg = 1.0
         end
@@ -1415,34 +1547,33 @@ Standard.class_eval do
   def model_apply_prototype_hvac_assumptions(model, building_type, climate_zone)
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started applying prototype HVAC assumptions.')
 
-    ##### Apply equipment efficiencies
-
-    # Fans
-    # Pressure Rise
-
-    model.getFanConstantVolumes.sort.each {|obj| fan_constant_volume_apply_prototype_fan_pressure_rise(obj)}
-    model.getFanVariableVolumes.sort.each {|obj| fan_variable_volume_apply_prototype_fan_pressure_rise(obj)}
-    model.getFanOnOffs.sort.each {|obj| fan_on_off_apply_prototype_fan_pressure_rise(obj)}
-    model.getFanZoneExhausts.sort.each {|obj| fan_zone_exhaust_apply_prototype_fan_pressure_rise(obj)}
+    # Fan pressure rise
+    model.getFanConstantVolumes.sort.each { |obj| fan_constant_volume_apply_prototype_fan_pressure_rise(obj) }
+    model.getFanVariableVolumes.sort.each { |obj| fan_variable_volume_apply_prototype_fan_pressure_rise(obj) }
+    model.getFanOnOffs.sort.each { |obj| fan_on_off_apply_prototype_fan_pressure_rise(obj) }
+    model.getFanZoneExhausts.sort.each { |obj| fan_zone_exhaust_apply_prototype_fan_pressure_rise(obj) }
 
-    # Motor Efficiency
-    model.getFanConstantVolumes.sort.each {|obj| prototype_fan_apply_prototype_fan_efficiency(obj)}
-    model.getFanVariableVolumes.sort.each {|obj| prototype_fan_apply_prototype_fan_efficiency(obj)}
-    model.getFanOnOffs.sort.each {|obj| prototype_fan_apply_prototype_fan_efficiency(obj)}
-    model.getFanZoneExhausts.sort.each {|obj| prototype_fan_apply_prototype_fan_efficiency(obj)}
+    # Fan motor efficiency
+    model.getFanConstantVolumes.sort.each { |obj| prototype_fan_apply_prototype_fan_efficiency(obj) }
+    model.getFanVariableVolumes.sort.each { |obj| prototype_fan_apply_prototype_fan_efficiency(obj) }
+    model.getFanOnOffs.sort.each { |obj| prototype_fan_apply_prototype_fan_efficiency(obj) }
+    model.getFanZoneExhausts.sort.each { |obj| prototype_fan_apply_prototype_fan_efficiency(obj) }
 
     # Gas Heating Coil
-    model.getCoilHeatingGass.sort.each {|obj| coil_heating_gas_apply_prototype_efficiency(obj)}
+    model.getCoilHeatingGass.sort.each { |obj| coil_heating_gas_apply_prototype_efficiency(obj) }
 
-    ##### Add Economizers
+    # Add Economizers
     apply_economizers(climate_zone, model)
 
     # TODO: What is the logic behind hard-sizing
     # hot water coil convergence tolerances?
-    model.getControllerWaterCoils.sort.each {|obj| controller_water_coil_set_convergence_limits(obj)}
+    model.getControllerWaterCoils.sort.each { |obj| controller_water_coil_set_convergence_limits(obj) }
 
-    # adjust defrost curve limits for coil heating dx single speed
-    model.getCoilHeatingDXSingleSpeeds.sort.each {|obj| coil_heating_dx_single_speed_apply_defrost_eir_curve_limits(obj)}
+    # Adjust defrost curve limits for coil heating dx single speed
+    model.getCoilHeatingDXSingleSpeeds.sort.each { |obj| coil_heating_dx_single_speed_apply_defrost_eir_curve_limits(obj) }
+
+    # Pump part load performances
+    model.getPumpVariableSpeeds.sort.each { |obj| pump_variable_speed_control_type(obj) }
 
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished applying prototype HVAC assumptions.')
   end
@@ -1452,12 +1583,10 @@ Standard.class_eval do
   #
   # @param model [OpenStudio::Model::Model] the model
   def model_apply_prototype_hvac_efficiency_adjustments(model)
-
     # ERVs
     # Applies the DOE Prototype Building assumption that ERVs use
     # enthalpy wheels and therefore exceed the minimum effectiveness specified by 90.1
-    model.getHeatExchangerAirToAirSensibleAndLatents.each {|obj| heat_exchanger_air_to_air_sensible_and_latent_apply_prototype_efficiency(obj)}
-
+    model.getHeatExchangerAirToAirSensibleAndLatents.each { |obj| heat_exchanger_air_to_air_sensible_and_latent_apply_prototype_efficiency(obj) }
     return true
   end
 
@@ -1807,12 +1936,12 @@ Standard.class_eval do
 
   # Return the dominant standards building type
   def model_get_standards_building_type(model)
-
     # determine areas of each building type
     building_type_areas = {}
     model.getSpaces.each do |space|
       # ignore space if not part of total area
       next unless space.partofTotalFloorArea
+
       if space.spaceType.is_initialized
         space_type = space.spaceType.get
         if space_type.standardsBuildingType.is_initialized
@@ -1830,7 +1959,7 @@ Standard.class_eval do
     building_type = building_type_areas.key(building_type_areas.values.max)
 
     if building_type.nil?
-      OpenStudio.logFree(OpenStudio::Info, 'openstudio.prototype.Model', "Model has no dominant standards building type.")
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.prototype.Model', 'Model has no dominant standards building type.')
     else
       OpenStudio.logFree(OpenStudio::Info, 'openstudio.prototype.Model', "#{building_type} is the dominant standards building type.")
     end
@@ -1860,8 +1989,8 @@ Standard.class_eval do
     end
 
     # Group the zones by occupancy type
-    type_to_area = Hash.new {0.0}
-    zones_grouped_by_occ = zones.group_by {|z| z['occ']}
+    type_to_area = Hash.new { 0.0 }
+    zones_grouped_by_occ = zones.group_by { |z| z['occ'] }
 
     # Determine the dominant occupancy type by area
     zones_grouped_by_occ.each do |occ_type, zns|
@@ -1869,7 +1998,7 @@ Standard.class_eval do
         type_to_area[occ_type] += zn['area']
       end
     end
-    dom_occ = type_to_area.sort_by {|k, v| v}.reverse[0][0]
+    dom_occ = type_to_area.sort_by { |k, v| v }.reverse[0][0]
 
     # Get the dominant occupancy type group
     dom_occ_group = zones_grouped_by_occ[dom_occ]
@@ -1957,8 +2086,8 @@ Standard.class_eval do
     end
 
     # Group the zones by building type
-    type_to_area = Hash.new {0.0}
-    zones_grouped_by_bldg_type = zones.group_by {|z| z['bldg_type']}
+    type_to_area = Hash.new { 0.0 }
+    zones_grouped_by_bldg_type = zones.group_by { |z| z['bldg_type'] }
 
     # Determine the dominant building type by area
     zones_grouped_by_bldg_type.each do |bldg_type, zns|
@@ -1966,7 +2095,7 @@ Standard.class_eval do
         type_to_area[bldg_type] += zn['area']
       end
     end
-    dom_bldg_type = type_to_area.sort_by {|k, v| v}.reverse[0][0]
+    dom_bldg_type = type_to_area.sort_by { |k, v| v }.reverse[0][0]
 
     # Get the dominant building type group
     dom_bldg_type_group = zones_grouped_by_bldg_type[dom_bldg_type]
@@ -2097,9 +2226,17 @@ Standard.class_eval do
       economizer_required = false
 
       if air_loop_hvac_humidifier_count(air_loop) > 0
-        # If airloop includes it is assumed that exception c to 90.1-2004 Section 6.5.1 applies
-        # This exception exist through 90.1-2013, see Section 6.5.1.3
-        economizer_required = false
+        # If airloop includes a humidifier it is assumed
+        # that exception c to 90.1-2004/7 Section 6.5.1 applies.
+        if template == '90.1-2004' || template == '90.1-2007'
+          economizer_required = false
+                  end
+        # This exception exist through 90.1-2019, for hospitals
+        # see Section 6.5.1 exception 4
+        if @instvarbuilding_type == 'Hospital' &&
+           (template == '90.1-2013' || template == '90.1-2016' || template == '90.1-2019')
+          economizer_required = false
+        end
       elsif @instvarbuilding_type == 'LargeOffice' &&
             air_loop.name.to_s.downcase.include?('datacenter') &&
             air_loop.name.to_s.downcase.include?('basement') &&
@@ -2161,4 +2298,252 @@ Standard.class_eval do
     end
   end
 
+  # Implement occupancy based lighting level threshold (0.02 W/sqft). This is only for ASHRAE 90.1 2016 onwards.
+  #
+  # @code_sections [90.1-2016_9.4.1.1.h/i]
+  # @author Xuechen (Jerry) Lei, PNNL
+  # @param model [OpenStudio::Model::Model] OpenStudio Model
+  #
+  def model_add_lights_shutoff(model)
+    return false
+  end
+
+  # Get building door information to update infiltration
+  #
+  # return [Hash] Door infiltration information
+  def get_building_door_info(model)
+    get_building_door_info = {}
+
+    return get_building_door_info
+  end
+
+  # Metal coiling door code minimum infiltration rate at 75 Pa
+  #
+  # @param [String] Climate zone
+  # @return [Float] Minimum infiltration rate for metal coiling doors
+  def model_door_infil_flow_rate_metal_coiling_cfm_ft2(climate_zone)
+    case climate_zone
+      when 'ASHRAE 169-2006-7A',
+           'ASHRAE 169-2006-7B',
+           'ASHRAE 169-2006-8A',
+           'ASHRAE 169-2006-8B'
+        return 0.4
+      else
+        return 4.4
+    end
+  end
+
+  # Metal rollup door code minimum infiltration rate at 75 Pa
+  #
+  # @param [String] Climate zone
+  # @return [Float] Minimum infiltration rate for metal coiling doors
+  def model_door_infil_flow_rate_rollup_cfm_ft2(climate_zone)
+    return 0.4
+  end
+
+  # Open door infiltration rate at 75 Pa
+  #
+  # @param [String] Climate zone
+  # @return [Float] Open door infiltration rate
+  def model_door_infil_flow_rate_open_cfm_ft2(climate_zone)
+    return 9.7875
+  end
+
+  # Add door infiltration
+  #
+  # @param [OpenStudio:Model::Model] OpenStudio model object
+  # @climate_zone [String] Climate zone
+  # @return [Boolean] Returns true if successful, false otherwise or not applicable
+  def model_add_door_infiltration(model, climate_zone)
+    # Get door parameters for the building model
+    bldg_door_types = get_building_door_info(model)
+    return false if bldg_door_types.empty?
+
+    bldg_door_types.each do |door_type, door_info|
+      # Get infiltration flow rate at 75 Pa
+      case door_type
+        when 'Metal coiling'
+          door_infil_flow_rate_cfm_per_ft2 = model_door_infil_flow_rate_metal_coiling_cfm_ft2(climate_zone)
+        when 'Rollup'
+          door_infil_flow_rate_cfm_per_ft2 = model_door_infil_flow_rate_rollup_cfm_ft2(climate_zone)
+        when 'Open'
+          door_infil_flow_rate_cfm_per_ft2 = model_door_infil_flow_rate_open_cfm_ft2(climate_zone)
+        else
+          OpenStudio.logFree(OpenStudio::Warn, 'openstudio.prototype.Model', "The #{door_type.downcase} type of door is not currently supported.")
+          next
+      end
+
+      # Calculate door infiltration
+      door_infil_cfm = door_info['number_of_doors'] * door_info['door_area_ft2'] * door_infil_flow_rate_cfm_per_ft2
+
+      # Conversion factor
+      conv_fact = OpenStudio.convert(1, 'm^3/s', 'ft^3/min').to_f
+
+      # Adjust the infiltration rate to the average pressure for the prototype buildings.
+      adj_door_infil_cfm = adjust_infiltration_to_prototype_building_conditions(door_infil_cfm)
+      adj_door_infil_m3_per_s = adj_door_infil_cfm / conv_fact
+
+      # Create door infiltration object
+      door_infil_obj = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(model)
+      door_infil_obj.setName("#{door_info['number_of_doors']} #{door_info['door_area_ft2']} ft2 #{door_type.downcase} Door Infiltration")
+      door_infil_obj.setSchedule(door_info['schedule'])
+      door_infil_obj.setDesignFlowRate(adj_door_infil_m3_per_s)
+      door_infil_obj.setSpace(model.getSpaceByName(door_info['space']).get)
+      door_infil_obj.setConstantTermCoefficient(0.0)
+      door_infil_obj.setTemperatureTermCoefficient 0.0
+      door_infil_obj.setVelocityTermCoefficient(0.224)
+      door_infil_obj.setVelocitySquaredTermCoefficient(0.0)
+    end
+
+    return true
+  end
+
+  # Set the model's north axis (degrees from true North)
+  #
+  # @param model [OpenStudio::Model::Model] OpenStudio model object
+  # @param north_axis [Float] Degrees from true North
+  # @return [Boolean] Returns true if successful, false otherwise
+  def model_set_building_north_axis(model, north_axis)
+    return false if north_axis.nil?
+
+    building = model.getBuilding
+    building.setNorthAxis(north_axis)
+
+    return true
+  end
+
+  # Calculate a model's window or WWR for a specific orientation
+  # Disregard space conditioning (assume all spaces are conditioned)
+  # which is true for most of not all prototypes
+  #
+  # @param model [OpenStudio::Model::Model] OpenStudio model objetc
+  # @param orientation [String] Orientation: "N", "E", "S", "W"
+  # @return [Boolean] Returns true if successful, false otherwise
+  def model_get_window_area_info_for_orientation(model, orientation, wwr: true)
+    return false unless ['N', 'E', 'S', 'W'].include? orientation
+
+    window_area = 0
+    wall_area = 0
+
+    model.getSpaces.each do |space|
+      # Get zone multiplier
+      multiplier = space.thermalZone.get.multiplier
+
+      space.surfaces.each do |surface|
+        next if surface.surfaceType != 'Wall'
+        next if surface.outsideBoundaryCondition != 'Outdoors'
+
+        case orientation
+          when 'N'
+            next unless surface_cardinal_direction(surface) == 'N'
+          when 'E'
+            next unless surface_cardinal_direction(surface) == 'E'
+          when 'S'
+            next unless surface_cardinal_direction(surface) == 'S'
+          when 'W'
+            next unless surface_cardinal_direction(surface) == 'W'
+        end
+
+        # Get wall and window area
+        wall_area += surface.grossArea * multiplier
+        surface.subSurfaces.each do |subsurface|
+          subsurface_type = subsurface.subSurfaceType.to_s.downcase
+          # Do not count doors
+          next unless (subsurface_type.include? 'window') || (subsurface_type.include? 'glass')
+
+          window_area += subsurface.grossArea * subsurface.multiplier * multiplier
+        end
+      end
+    end
+
+    if wwr
+      return window_area / wall_area
+    else
+      window_area
+    end
+  end
+
+  # Adjust model to comply with fenestration orientation
+  #
+  # @param [OpenStudio::Model::Model] OpenStudio model object
+  # @return [Boolean] Returns true if successful, false otherwise
+  def model_fenestration_orientation(model, climate_zone)
+    return true
+  end
+
+  # Is transfer air required?
+  #
+  # @param model [OpenStudio::Model::Model] OpenStudio model object
+  # @return [Boolean] true if transfer air is required, false otherwise
+  def model_transfer_air_required?(model)
+    return false
+  end
+
+  # List transfer air target and source zones, and air flow (cfm)
+  #
+  # code_sections [90.1-2019_6.5.7.1], [90.1-2016_6.5.7.1]
+  # @return [Hash] target zones (key) and source zones (value) and air flow (value)
+  def model_transfer_air_target_and_source_zones(model)
+    model_transfer_air_target_and_source_zones_hash = {}
+
+    return model_transfer_air_target_and_source_zones_hash
+  end
+
+  # Add transfer to prototype for spaces that require it
+  #
+  # @param model [OpenStudio::Model::Model] OpenStudio model object
+  # @return [Boolean] true if successful, false otherwise
+  def model_add_transfer_air(model)
+    # Do not add transfer air if not required
+    return true unless model_transfer_air_required?(model)
+
+    # Get target and source zones
+    target_and_source_zones = model_transfer_air_target_and_source_zones(model)
+    return true if target_and_source_zones.empty?
+
+    model.getFanZoneExhausts.sort.each do |exhaust_fan|
+      # Target zone (zone with exhaust fan)
+      target_zone = exhaust_fan.thermalZone.get
+
+      # Get zone name of an exhaust fan
+      exhaust_fan_zone_name = target_zone.name.to_s
+
+      # Go to next exhaust fan if this zone isn't using transfer air
+      next unless target_and_source_zones.keys.include? exhaust_fan_zone_name
+
+      # Add dummy exhaust fan in source zone
+      source_zone_name, transfer_air_flow_cfm = target_and_source_zones[exhaust_fan_zone_name]
+      source_zone = model.getThermalZoneByName(source_zone_name).get
+      transfer_air_source_zone_exhaust_fan = OpenStudio::Model::FanZoneExhaust.new(model)
+      transfer_air_source_zone_exhaust_fan.setName(source_zone.name.to_s + ' Dummy Transfer Air (Source) Fan')
+      transfer_air_source_zone_exhaust_fan.setAvailabilitySchedule(exhaust_fan.availabilitySchedule.get)
+      # Convert transfer air flow to m3/s
+      transfer_air_flow_m3s = OpenStudio.convert(transfer_air_flow_cfm, 'cfm', 'm^3/s').get
+      transfer_air_source_zone_exhaust_fan.setMaximumFlowRate(transfer_air_flow_m3s)
+      transfer_air_source_zone_exhaust_fan.setFanEfficiency(1.0)
+      transfer_air_source_zone_exhaust_fan.setPressureRise(0.0)
+      transfer_air_source_zone_exhaust_fan.addToThermalZone(source_zone)
+
+      # Set exhaust fan balanced air flow schedule to only consider the transfer air to be balanced air flow
+      balanced_air_flow_schedule = exhaust_fan.availabilitySchedule.get.clone(model).to_ScheduleRuleset.get
+      balanced_air_flow_schedule.setName("#{exhaust_fan_zone_name} Exhaust Fan Balanced Air Flow Schedule")
+      model_multiply_schedule(model, balanced_air_flow_schedule.defaultDaySchedule, transfer_air_flow_m3s / exhaust_fan.maximumFlowRate.get, 0)
+      balanced_air_flow_schedule.scheduleRules.each do |sch_rule|
+        model_multiply_schedule(model, sch_rule.daySchedule, transfer_air_flow_m3s / exhaust_fan.maximumFlowRate.get, 0)
+      end
+      transfer_air_source_zone_exhaust_fan.setBalancedExhaustFractionSchedule(balanced_air_flow_schedule)
+
+      # Modify design specification OA to take into account transfer air for sizing only
+      # OA is zero'd out for other days
+      target_zone.spaces.sort.each do |space|
+        target_zone_ventilation = space.designSpecificationOutdoorAir.get
+        target_zone_ventilation.setOutdoorAirFlowperPerson(0)
+        target_zone_ventilation.setOutdoorAirFlowperFloorArea(0)
+        target_zone_ventilation.setOutdoorAirFlowRate(exhaust_fan.maximumFlowRate.get - transfer_air_flow_m3s)
+        target_zone_ventilation.setOutdoorAirFlowRateFractionSchedule(model_add_schedule(model, 'DesignDaysOnly'))
+      end
+    end
+
+    return true
+  end
 end