openstudio-standards 0.2.12 → 0.2.13.rc3

data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.PumpVariableSpeed.rb

@@ -0,0 +1,144 @@
+class ASHRAE9012019 < ASHRAE901
+  # @!group Pump
+
+  # Determine type of pump part load control type
+  #
+  # @code_sections [90.1-2019_6.5.4.2]
+  # @param pump [OpenStudio::Model::PumpVariableSpeed] OpenStudio pump object
+  # @param plant_loop_type [String] Type of plant loop
+  # @param pump_nominal_hp [Float] Pump nominal horsepower
+  # @return [String] Pump part load control type
+  def pump_variable_speed_get_control_type(pump, plant_loop_type, pump_nominal_hp)
+    # Sizing factor to take into account that pumps
+    # are typically sized to handle a ~10% pressure
+    # increase and ~10% flow increase.
+    design_sizing_factor = 1.25
+
+    # Get climate zone
+    climate_zone = pump.plantLoop.get.model.getClimateZones.getClimateZone(0)
+    climate_zone = "#{climate_zone.institution} 169-#{climate_zone.year}-#{climate_zone.value}"
+
+    # Get nameplate hp threshold:
+    # The thresholds below represent the nameplate
+    # hp one level lower than the threshold in the
+    # code. Motor size from table in section 10 are
+    # used as reference.
+    case plant_loop_type
+      when 'Heating'
+        case climate_zone
+          when 'ASHRAE 169-2006-7A',
+               'ASHRAE 169-2006-7B',
+               'ASHRAE 169-2006-8A',
+               'ASHRAE 169-2006-8B',
+               'ASHRAE 169-2013-7A',
+               'ASHRAE 169-2013-7B',
+               'ASHRAE 169-2013-8A',
+               'ASHRAE 169-2013-8B'
+            threshold = 3
+          when 'ASHRAE 169-2006-3C',
+               'ASHRAE 169-2006-5A',
+               'ASHRAE 169-2006-5C',
+               'ASHRAE 169-2006-6A',
+               'ASHRAE 169-2006-6B',
+               'ASHRAE 169-2013-3C',
+               'ASHRAE 169-2013-5A',
+               'ASHRAE 169-2013-5C',
+               'ASHRAE 169-2013-6A',
+               'ASHRAE 169-2013-6B'
+            threshold = 5
+          when 'ASHRAE 169-2006-4A',
+               'ASHRAE 169-2006-4C',
+               'ASHRAE 169-2006-5B',
+               'ASHRAE 169-2013-4A',
+               'ASHRAE 169-2013-4C',
+               'ASHRAE 169-2013-5B'
+            threshold = 7.5
+          when 'ASHRAE 169-2006-4B',
+               'ASHRAE 169-2013-4B'
+            threshold = 10
+          when 'ASHRAE 169-2006-2A',
+               'ASHRAE 169-2006-2B',
+               'ASHRAE 169-2006-3A',
+               'ASHRAE 169-2006-3B',
+               'ASHRAE 169-2013-2A',
+               'ASHRAE 169-2013-2B',
+               'ASHRAE 169-2013-3A',
+               'ASHRAE 169-2013-3B'
+            threshold = 20
+          when 'ASHRAE 169-2006-1B',
+               'ASHRAE 169-2013-1B'
+            threshold = 75
+          when 'ASHRAE 169-2006-0A',
+               'ASHRAE 169-2006-0B',
+               'ASHRAE 169-2006-1A',
+               'ASHRAE 169-2013-0A',
+               'ASHRAE 169-2013-0B',
+               'ASHRAE 169-2013-1A'
+            threshold = 150
+          else
+            OpenStudio.logFree(OpenStudio::Warn, "Pump flow control requirement missing for heating water pumps in climate zone: #{climate_zone}.")
+        end
+      when 'Cooling'
+        case climate_zone
+          when 'ASHRAE 169-2006-0A',
+               'ASHRAE 169-2006-0B',
+               'ASHRAE 169-2006-1A',
+               'ASHRAE 169-2006-1B',
+               'ASHRAE 169-2006-2B',
+               'ASHRAE 169-2013-0A',
+               'ASHRAE 169-2013-0B',
+               'ASHRAE 169-2013-1A',
+               'ASHRAE 169-2013-1B',
+               'ASHRAE 169-2013-2B'
+            threshold = 1.5
+          when 'ASHRAE 169-2006-2A',
+               'ASHRAE 169-2006-3B',
+               'ASHRAE 169-2013-2A',
+               'ASHRAE 169-2013-3B'
+            threshold = 2
+          when 'ASHRAE 169-2006-3A',
+               'ASHRAE 169-2006-3C',
+               'ASHRAE 169-2006-4A',
+               'ASHRAE 169-2006-4B',
+               'ASHRAE 169-2013-3A',
+               'ASHRAE 169-2013-3C',
+               'ASHRAE 169-2013-4A',
+               'ASHRAE 169-2013-4B'
+            threshold = 3
+          when 'ASHRAE 169-2006-4C',
+               'ASHRAE 169-2006-5A',
+               'ASHRAE 169-2006-5B',
+               'ASHRAE 169-2006-5C',
+               'ASHRAE 169-2006-6A',
+               'ASHRAE 169-2006-6B',
+               'ASHRAE 169-2013-4C',
+               'ASHRAE 169-2013-5A',
+               'ASHRAE 169-2013-5B',
+               'ASHRAE 169-2013-5C',
+               'ASHRAE 169-2013-6A',
+               'ASHRAE 169-2013-6B'
+            threshold = 5
+          when 'ASHRAE 169-2006-7A',
+               'ASHRAE 169-2006-7B',
+               'ASHRAE 169-2006-8A',
+               'ASHRAE 169-2006-8B',
+               'ASHRAE 169-2013-7A',
+               'ASHRAE 169-2013-7B',
+               'ASHRAE 169-2013-8A',
+               'ASHRAE 169-2013-8B'
+            threshold = 10
+          else
+            OpenStudio.logFree(OpenStudio::Warn, "Pump flow control requirement missing for chilled water pumps in climate zone: #{climate_zone}.")
+        end
+      else
+        OpenStudio.logFree(OpenStudio::Warn, "No pump flow requirement for #{plant_loop_type} plant loops.")
+        return false
+    end
+
+    if pump_nominal_hp * design_sizing_factor > threshold
+      return 'VSD DP Reset'
+    else
+      return 'Riding Curve'
+    end
+  end
+  end

data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.hvac_systems.rb

@@ -0,0 +1,11 @@
+class ASHRAE9012019 < ASHRAE901
+  # @!group hvac_systems
+
+  # Determine which type of fan the cooling tower
+  # will have.  Variable Speed Fan for ASHRAE 90.1-2019.
+  # @return [String] the fan type: TwoSpeed Fan, Variable Speed Fan
+  def model_cw_loop_cooling_tower_fan_type(model)
+    fan_type = 'Variable Speed Fan'
+    return fan_type
+  end
+end

data/lib/openstudio-standards/prototypes/ashrae_90_1/doe_ref_1980_2004/doe_ref_1980_2004.AirTerminalSingleDuctVAVReheat.rb

@@ -7,7 +7,6 @@ class DOERef1980to2004 < ASHRAE901
   # @param zone_oa_per_area [Double] the zone outdoor air per area, m^3/s
   # @return [Bool] returns true if successful, false if not
   def air_terminal_single_duct_vav_reheat_apply_initial_prototype_damper_position(air_terminal_single_duct_vav_reheat, zone_oa_per_area)
-
     # Set the minimum flow fraction
     min_damper_position = 0.3
     air_terminal_single_duct_vav_reheat.setConstantMinimumAirFlowFraction(min_damper_position)

data/lib/openstudio-standards/prototypes/ashrae_90_1/doe_ref_pre_1980/doe_ref_pre_1980.AirTerminalSingleDuctVAVReheat.rb

@@ -7,7 +7,6 @@ class DOERefPre1980 < ASHRAE901
   # @param zone_oa_per_area [Double] the zone outdoor air per area, m^3/s
   # @return [Bool] returns true if successful, false if not
   def air_terminal_single_duct_vav_reheat_apply_initial_prototype_damper_position(air_terminal_single_duct_vav_reheat, zone_oa_per_area)
-
     # Set the minimum flow fraction
     min_damper_position = 0.3
     air_terminal_single_duct_vav_reheat.setConstantMinimumAirFlowFraction(min_damper_position)

data/lib/openstudio-standards/prototypes/ashrae_90_1/nrel_nze_ready_2017/nrel_zne_ready_2017.HeatExchangerAirToAirSensibleAndLatent.rb

@@ -3,7 +3,7 @@ class NRELZNEReady2017 < ASHRAE901
 
   # Default fan efficiency assumption for the prm added fan power
   def heat_exchanger_air_to_air_sensible_and_latent_prototype_default_fan_efficiency
-    default_fan_efficiency  = 0.55
+    default_fan_efficiency = 0.55
     return default_fan_efficiency
   end
 end

data/lib/openstudio-standards/prototypes/ashrae_90_1/nrel_nze_ready_2017/nrel_zne_ready_2017.Model.rb

@@ -32,4 +32,4 @@ class NRELZNEReady2017 < ASHRAE901
                       end
     return economizer_type
   end
-end
+end

data/lib/openstudio-standards/prototypes/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.HeatExchangerAirToAirSensibleAndLatent.rb

@@ -3,7 +3,7 @@ class ZEAEDGMultifamily < ASHRAE901
 
   # Default fan efficiency assumption for the prm added fan power
   def heat_exchanger_air_to_air_sensible_and_latent_prototype_default_fan_efficiency
-    default_fan_efficiency  = 0.55
+    default_fan_efficiency = 0.55
     return default_fan_efficiency
   end
 end

data/lib/openstudio-standards/prototypes/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.Model.rb

@@ -32,4 +32,4 @@ class ZEAEDGMultifamily < ASHRAE901
                       end
     return economizer_type
   end
-end
+end

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.College.rb

@@ -10,12 +10,12 @@ module College
     #   SpaceInfiltration "Peak: 0.2016 cfm/sf of above grade exterior wall surface area, adjusted by wind (when fans turn off)
     # Off Peak: 25% of peak infiltration rate (when fans turn on)
     # Additional infiltration through building entrance"
-    infil_schedule = model.getScheduleRulesetByName("College INFIL_SCH_PNNL")
+    infil_schedule = model.getScheduleRulesetByName('College INFIL_SCH_PNNL')
     model.getSpaceTypes.sort.each do |space_type|
       infil_flow_rates = space_type.getSpaceInfiltrationDesignFlowRates
       if infil_flow_rates.empty?
         # create a new infiltration object for the spacetypes without any infiltration defined
-        infil_flow_rate = Openstudio::Model::getSpaceInfiltrationDesignFlowRate.new(model)
+        infil_flow_rate = Openstudio::Model::SpaceInfiltrationDesignFlowRate.new(model)
         infil_flow_rate.setSpaceInfiltrationDesignFlowRate(0.2016)
         infil_flow_rate.setSchedule(infil_schedule)
         infil_flow_rate.setSpaceType(space_type)
@@ -28,7 +28,7 @@ module College
     end
 
     building_entrance_lobby = model.getSpaceByName('CB_ Entrance Lobby_F0')
-    lobby_door_leakage_area = Openstudio::Model::getSpaceInfiltrationEffectiveLeakageArea.new(model)
+    lobby_door_leakage_area = Openstudio::Model::SpaceInfiltrationEffectiveLeakageArea.new(model)
     lobby_door_leakage_area.setEffectiveAirLeakageArea(5.0) # Need modification
     lobby_door_leakage_area.setSpace(building_entrance_lobby)
 

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.Courthouse.rb

@@ -0,0 +1,74 @@
+# Custom changes for the Courthouse prototype.
+# These are changes that are inconsistent with other prototype
+# building types.
+module Courthouse
+  def model_custom_hvac_tweaks(building_type, climate_zone, prototype_input, model)
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
+
+    model.getSpaces.each do |space|
+      if space.name.get.to_s == 'ELEVATOR_LOBBY_FLR_1'
+        model_add_elevator(model,
+                           space,
+                           prototype_input['number_of_elevators'],
+                           prototype_input['elevator_type'],
+                           prototype_input['elevator_schedule'],
+                           prototype_input['elevator_fan_schedule'],
+                           prototype_input['elevator_fan_schedule'],
+                           building_type)
+      end
+    end
+
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
+
+    # add extra infiltration for entry door
+    add_door_infiltration(climate_zone, model)
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Added door infiltration')
+
+    return true
+  end # add hvac
+
+  def add_door_infiltration(climate_zone, model)
+    # add extra infiltration for entry door in m3/s (there is no attic in 'DOE Ref Pre-1980')
+    unless template == 'DOE Ref 1980-2004' || template == 'DOE Ref Pre-1980'
+      entry_space = model.getSpaceByName('SECURITY_SCREENING_FLR_1').get
+      infiltration_entrydoor = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(model)
+      infiltration_entrydoor.setName('entry door Infiltration')
+      infiltration_per_zone_entrydoor = 0
+      if template == '90.1-2004'
+        infiltration_per_zone_entrydoor = 3.242751
+        infiltration_entrydoor.setSchedule(model_add_schedule(model, 'Courthouse INFIL_Door_Opening_SCH'))
+      elsif template == '90.1-2007' || template == '90.1-2010' || template == '90.1-2013'
+        case climate_zone
+        when 'ASHRAE 169-2006-1A', 'ASHRAE 169-2006-2A', 'ASHRAE 169-2006-1B', 'ASHRAE 169-2006-2B'
+          infiltration_per_zone_entrydoor = 3.242751
+          infiltration_entrydoor.setSchedule(model_add_schedule(model, 'Courthouse INFIL_Door_Opening_SCH'))
+        else
+          infiltration_per_zone_entrydoor = 2.220041
+          infiltration_entrydoor.setSchedule(model_add_schedule(model, 'Courthouse INFIL_Door_Opening_SCH'))
+        end
+      end
+      infiltration_entrydoor.setDesignFlowRate(infiltration_per_zone_entrydoor)
+      infiltration_entrydoor.setSpace(entry_space)
+    end
+  end
+
+  def update_waterheater_loss_coefficient(model)
+    case template
+    when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', 'NECB 2011'
+      model.getWaterHeaterMixeds.sort.each do |water_heater|
+        water_heater.setOffCycleLossCoefficienttoAmbientTemperature(7.561562668)
+        water_heater.setOnCycleLossCoefficienttoAmbientTemperature(7.561562668)
+      end
+    end
+  end
+
+  def model_custom_swh_tweaks(model, building_type, climate_zone, prototype_input)
+    update_waterheater_loss_coefficient(model)
+
+    return true
+  end
+
+  def model_custom_geometry_tweaks(building_type, climate_zone, prototype_input, model)
+    return true
+end
+end

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.FullServiceRestaurant.rb

@@ -1,4 +1,3 @@
-
 # Custom changes for the FullServiceRestaurant prototype.
 # These are changes that are inconsistent with other prototype
 # building types.
@@ -28,31 +27,37 @@ module FullServiceRestaurant
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Adjusting daylight sensor positions and fractions')
 
     adjustments = [
-                    { '90.1-2010' => { 'Dining' => { 'sensor_1_frac' => 0.135,
-                                                     'sensor_2_frac' => 0.135,
-                                                     'sensor_1_xyz' => [1.9812, 1.9812, 0.762],
-                                                     'sensor_2_xyz' => [20.574, 1.9812, 0.762],
-																									 },
-                                      },
-                      '90.1-2013' => { 'Dining' => { 'sensor_1_frac' => 0.25,
-                                                     'sensor_2_frac' => 0.25,
-                                                     'sensor_1_xyz' => [2.6548, 2.6548, 0.762],
-                                                     'sensor_2_xyz' => [19.9539, 2.6548, 0.762],
-																												},
-                                      },
-										}
-                  ]
+      { '90.1-2010' => { 'Dining' => { 'sensor_1_frac' => 0.135,
+                                       'sensor_2_frac' => 0.135,
+                                       'sensor_1_xyz' => [1.9812, 1.9812, 0.762],
+                                       'sensor_2_xyz' => [20.574, 1.9812, 0.762] } },
+        '90.1-2013' => { 'Dining' => { 'sensor_1_frac' => 0.25,
+                                       'sensor_2_frac' => 0.25,
+                                       'sensor_1_xyz' => [2.6548, 2.6548, 0.762],
+                                       'sensor_2_xyz' => [19.9539, 2.6548, 0.762] } },
+        '90.1-2016' => { 'Dining' => { 'sensor_1_frac' => 0.25,
+                                       'sensor_2_frac' => 0.25,
+                                       'sensor_1_xyz' => [2.6548, 2.6548, 0.762],
+                                       'sensor_2_xyz' => [19.9539, 2.6548, 0.762] } },
+        '90.1-2019' => { 'Dining' => { 'sensor_1_frac' => 0.25,
+                                       'sensor_2_frac' => 0.25,
+                                       'sensor_1_xyz' => [2.6548, 2.6548, 0.762],
+                                       'sensor_2_xyz' => [19.9539, 2.6548, 0.762] } } }
+    ]
 
     # Adjust daylight sensors in each space
     model.getSpaces.each do |space|
-      if adjustments[0].keys.include? (template)
-        if adjustments[0][template].keys.include? (space.name.to_s)
+      if adjustments[0].keys.include?(template)
+        if adjustments[0][template].keys.include?(space.name.to_s)
           adj = adjustments[0][template][space.name.to_s]
           next if space.thermalZone.empty?
+
           zone = space.thermalZone.get
           next if space.spaceType.empty?
+
           spc_type = space.spaceType.get
           next if spc_type.standardsSpaceType.empty?
+
           stds_spc_type = spc_type.standardsSpaceType.get
           # Adjust the primary sensor
           if adj['sensor_1_frac'] && zone.primaryDaylightingControl.is_initialized
@@ -90,7 +95,7 @@ module FullServiceRestaurant
 
     return true
   end
-  
+
   # add hvac
 
   def add_door_infiltration(climate_zone, model)
@@ -108,7 +113,8 @@ module FullServiceRestaurant
         infiltration_diningdoor.setSchedule(model_add_schedule(model, 'RestaurantSitDown DOOR_INFIL_SCH'))
       elsif template == '90.1-2007'
         case climate_zone
-          when 'ASHRAE 169-2006-1A',
+          when 'ASHRAE 169-2006-0A',
+               'ASHRAE 169-2006-1A',
                'ASHRAE 169-2006-2A',
                'ASHRAE 169-2006-2B',
                'ASHRAE 169-2006-3A',
@@ -117,6 +123,7 @@ module FullServiceRestaurant
                'ASHRAE 169-2006-4A',
                'ASHRAE 169-2006-4B',
                'ASHRAE 169-2006-4C',
+               'ASHRAE 169-2013-0A',
                'ASHRAE 169-2013-1A',
                'ASHRAE 169-2013-2A',
                'ASHRAE 169-2013-2B',
@@ -132,20 +139,22 @@ module FullServiceRestaurant
             infiltration_per_zone_diningdoor = 0.389828222
             infiltration_diningdoor.setSchedule(model_add_schedule(model, 'RestaurantSitDown VESTIBULE_DOOR_INFIL_SCH'))
         end
-      elsif template == '90.1-2010' || template == '90.1-2013'
+      elsif template == '90.1-2010' || template == '90.1-2013' || template == '90.1-2016' || template == '90.1-2019'
         case climate_zone
-          when 'ASHRAE 169-2006-1A',
+          when 'ASHRAE 169-2006-0A',
+               'ASHRAE 169-2006-1A',
                'ASHRAE 169-2006-2A',
                'ASHRAE 169-2006-2B',
                'ASHRAE 169-2006-3A',
                'ASHRAE 169-2006-3B',
                'ASHRAE 169-2006-3C',
+               'ASHRAE 169-2013-0A',
                'ASHRAE 169-2013-1A',
                'ASHRAE 169-2013-2A',
                'ASHRAE 169-2013-2B',
                'ASHRAE 169-2013-3A',
                'ASHRAE 169-2013-3B',
-               'ASHRAE 169-2013-3C',
+               'ASHRAE 169-2013-3C'
             infiltration_per_zone_diningdoor = 0.614474994
             infiltration_diningdoor.setSchedule(model_add_schedule(model, 'RestaurantSitDown DOOR_INFIL_SCH'))
           else
@@ -163,7 +172,7 @@ module FullServiceRestaurant
 
   def model_update_exhaust_fan_efficiency(model)
     case template
-      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'
         model.getFanZoneExhausts.sort.each do |exhaust_fan|
           fan_name = exhaust_fan.name.to_s
           if fan_name.include? 'Dining'
@@ -181,6 +190,9 @@ module FullServiceRestaurant
 
   def add_zone_mixing(model)
     # add zone_mixing between kitchen and dining
+    # TODO: remove zone mixing objects,
+    # transfer air is the should be the same for
+    # all stds, exhaust flow varies
     space_kitchen = model.getSpaceByName('Kitchen').get
     zone_kitchen = space_kitchen.thermalZone.get
     space_dining = model.getSpaceByName('Dining').get
@@ -190,7 +202,7 @@ module FullServiceRestaurant
     case template
       when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
         zone_mixing_kitchen.setDesignFlowRate(1.828)
-      when '90.1-2007', '90.1-2010', '90.1-2013'
+      when '90.1-2007', '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019'
         zone_mixing_kitchen.setDesignFlowRate(1.33143208)
       when '90.1-2004'
         zone_mixing_kitchen.setDesignFlowRate(2.64397817)
@@ -209,14 +221,14 @@ module FullServiceRestaurant
     elec_equip_def1.setName('Kitchen Electric Equipment Definition1')
     elec_equip_def2.setName('Kitchen Electric Equipment Definition2')
     case template
-      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'
         elec_equip_def1.setFractionLatent(0)
         elec_equip_def1.setFractionRadiant(0.25)
         elec_equip_def1.setFractionLost(0)
         elec_equip_def2.setFractionLatent(0)
         elec_equip_def2.setFractionRadiant(0.25)
         elec_equip_def2.setFractionLost(0)
-        if template == '90.1-2013'
+        if template == '90.1-2013' || template == '90.1-2016' || template == '90.1-2019'
           elec_equip_def1.setDesignLevel(457.5)
           elec_equip_def2.setDesignLevel(570)
         else
@@ -247,7 +259,7 @@ module FullServiceRestaurant
 
   def update_sizing_zone(model)
     case template
-      when '90.1-2007', '90.1-2010', '90.1-2013'
+      when '90.1-2007', '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019'
         zone_sizing = model.getSpaceByName('Dining').get.thermalZone.get.sizingZone
         zone_sizing.setCoolingDesignAirFlowMethod('DesignDayWithLimit')
         zone_sizing.setCoolingMinimumAirFlowperZoneFloorArea(0.003581176)
@@ -272,9 +284,11 @@ module FullServiceRestaurant
       case template
         when '90.1-2004', '90.1-2007', '90.1-2010'
           case climate_zone
-          when 'ASHRAE 169-2006-1B',
+          when 'ASHRAE 169-2006-0B',
+               'ASHRAE 169-2006-1B',
                'ASHRAE 169-2006-2B',
                'ASHRAE 169-2006-3B',
+               'ASHRAE 169-2013-0B',
                'ASHRAE 169-2013-1B',
                'ASHRAE 169-2013-2B',
                'ASHRAE 169-2013-3B'
@@ -298,7 +312,7 @@ module FullServiceRestaurant
     ventilation.setOutdoorAirFlowperPerson(0)
     ventilation.setOutdoorAirFlowperFloorArea(0)
     case template
-      when '90.1-2010', '90.1-2013'
+      when '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019'
         ventilation.setOutdoorAirFlowRate(1.21708392)
       when '90.1-2007'
         ventilation.setOutdoorAirFlowRate(1.50025792)
@@ -311,7 +325,7 @@ module FullServiceRestaurant
     model.getWaterHeaterMixeds.sort.each do |water_heater|
       if water_heater.name.to_s.include?('Booster')
         water_heater.resetAmbientTemperatureSchedule
-        water_heater.setAmbientTemperatureIndicator('ThermalZone')		
+        water_heater.setAmbientTemperatureIndicator('ThermalZone')
         water_heater.setAmbientTemperatureThermalZone(model.getThermalZoneByName('Kitchen ZN').get)
       end
     end
@@ -324,6 +338,8 @@ module FullServiceRestaurant
   end
 
   def model_custom_geometry_tweaks(building_type, climate_zone, prototype_input, model)
+    # Set original building North axis
+    model_set_building_north_axis(model, 0.0)
 
     return true
   end