openstudio-standards 0.2.12.rc4 → 0.2.13.rc3

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

@@ -1,10 +1,8 @@
-
-# Custom changes for the QuickServiceRestaurant prototype.
+# Custom changes for the SmallDataCenterHighITE prototype.
 # These are changes that are inconsistent with other prototype
 # building types.
 module SmallDataCenterHighITE
   def model_custom_hvac_tweaks(building_type, climate_zone, prototype_input, model)
-
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
 
     # add IT equipment (ITE object) for data center building types
@@ -19,12 +17,10 @@ module SmallDataCenterHighITE
     return true
   end
 
-
   # add IT equipment (ITE object) for data center building types
   # Normal electric equipment has been added in model_add_load prior to this
   # will replace with ITE object here
   def add_data_center_load(model)
-
     model.getSpaceTypes.each do |space_type|
       # Get the standards data
       space_type_properties = space_type_get_standards_data(space_type)
@@ -34,27 +30,27 @@ module SmallDataCenterHighITE
       elec_equip_sch = space_type_properties['electric_equipment_schedule']
       elec_equip_have_info = true unless elec_equip_per_area.zero?
 
-      it_fan_power_ratio = 0.4/(1+0.4)   # assuming IT fan power is 0.4 of total CPU load
+      it_fan_power_ratio = 0.4 / (1 + 0.4) # assuming IT fan power is 0.4 of total CPU load
 
-      if (space_type.name.get.downcase.include?('computer')) || (space_type.name.get.downcase.include?('datacenter'))
+      if space_type.name.get.downcase.include?('computer') || space_type.name.get.downcase.include?('datacenter')
         if elec_equip_have_info
           it_equipment_def = OpenStudio::Model::ElectricEquipmentITEAirCooledDefinition.new(model)
-          it_equipment_def.setName("IT equipment def")
+          it_equipment_def.setName('IT equipment def')
           it_equipment_def.setWattsperZoneFloorArea(OpenStudio.convert(elec_equip_per_area.to_f, 'W/ft^2', 'W/m^2').get)
           it_equipment_def.setDesignFanAirFlowRateperPowerInput(0.0001)
           it_equipment_def.setDesignFanPowerInputFraction(it_fan_power_ratio)
-          it_equipment_def.setDesignEnteringAirTemperature(22.5)    # recommended SAT 18-27C, use the middle T as design
-          it_equipment_def.setAirFlowCalculationMethod("FlowControlWithApproachTemperatures")
+          it_equipment_def.setDesignEnteringAirTemperature(22.5) # recommended SAT 18-27C, use the middle T as design
+          it_equipment_def.setAirFlowCalculationMethod('FlowControlWithApproachTemperatures')
           # Set the approach temperatures based on CFD simulation results
-          it_equipment_def.setSupplyTemperatureDifference(9.94)   # This is under fully open configuration assumption, based on the lookup table in scorecard
-          it_equipment_def.setReturnTemperatureDifference(-7.21)   # This is under fully open configuration assumption, based on the lookup table in scorecard
+          it_equipment_def.setSupplyTemperatureDifference(9.94) # This is under fully open configuration assumption, based on the lookup table in scorecard
+          it_equipment_def.setReturnTemperatureDifference(-7.21) # This is under fully open configuration assumption, based on the lookup table in scorecard
           # after the bug in OpenStudio core is fixed, this temperature schedules was enabled
-          it_equipment_def.setSupplyTemperatureDifferenceSchedule(model_add_schedule(model, 'SmallDataCenterHighITE SupplyApproachTemp_SCH'))   # This is under fully open configuration assumption, based on the lookup table in scorecard
+          it_equipment_def.setSupplyTemperatureDifferenceSchedule(model_add_schedule(model, 'SmallDataCenterHighITE SupplyApproachTemp_SCH')) # This is under fully open configuration assumption, based on the lookup table in scorecard
           it_equipment_def.setReturnTemperatureDifferenceSchedule(model_add_schedule(model, 'SmallDataCenterHighITE ReturnApproachTemp_SCH'))
 
           it_equipment = OpenStudio::Model::ElectricEquipmentITEAirCooled.new(it_equipment_def)
           it_equipment.setSpaceType(space_type)
-          it_equipment.setName("#{space_type.name.to_s} IT equipment")
+          it_equipment.setName("#{space_type.name} IT equipment")
           unless elec_equip_sch.nil?
             it_equipment.setDesignPowerInputSchedule(model_add_schedule(model, elec_equip_sch))
             OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set Design Power Input Schedule to #{elec_equip_sch}.")
@@ -72,6 +68,7 @@ module SmallDataCenterHighITE
     supply_temp_sch = get_crac_supply_temp_sch(model)
     model.getSetpointManagerScheduleds.each do |stpt_manager|
       next unless stpt_manager.name.to_s.downcase == 'crac supply air setpoint manager'
+
       stpt_manager.setSchedule(supply_temp_sch)
     end
   end
@@ -109,22 +106,19 @@ module SmallDataCenterHighITE
       supply_temp_diff_max = it_equip.supplyTemperatureDifference if it_equip.supplyTemperatureDifference > supply_temp_diff_max
       if supply_temp_diff_max > 0
         supply_temp_sch = model_add_constant_schedule_ruleset(model,
-                                                              it_equip.designEnteringAirTemperature-supply_temp_diff_max,
-                                                              name = "AHU Supply Temp Sch updated")
+                                                              it_equip.designEnteringAirTemperature - supply_temp_diff_max,
+                                                              name = 'AHU Supply Temp Sch updated')
       end
     end
 
     return supply_temp_sch
   end
 
-
   def model_custom_swh_tweaks(model, building_type, climate_zone, prototype_input)
-
     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.SmallDataCenterLowITE.rb

@@ -1,10 +1,8 @@
-
-# Custom changes for the QuickServiceRestaurant prototype.
+# Custom changes for the SmallDataCenterLowITE prototype.
 # These are changes that are inconsistent with other prototype
 # building types.
 module SmallDataCenterLowITE
   def model_custom_hvac_tweaks(building_type, climate_zone, prototype_input, model)
-
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
 
     # add IT equipment (ITE object) for data center building types
@@ -23,7 +21,6 @@ module SmallDataCenterLowITE
   # Normal electric equipment has been added in model_add_load prior to this
   # will replace with ITE object here
   def add_data_center_load(model)
-
     model.getSpaceTypes.each do |space_type|
       # Get the standards data
       space_type_properties = space_type_get_standards_data(space_type)
@@ -33,27 +30,27 @@ module SmallDataCenterLowITE
       elec_equip_sch = space_type_properties['electric_equipment_schedule']
       elec_equip_have_info = true unless elec_equip_per_area.zero?
 
-      it_fan_power_ratio = 0.4/(1+0.4)   # assuming IT fan power is 0.4 of total CPU load
+      it_fan_power_ratio = 0.4 / (1 + 0.4) # assuming IT fan power is 0.4 of total CPU load
 
-      if (space_type.name.get.downcase.include?('computer')) || (space_type.name.get.downcase.include?('datacenter'))
+      if space_type.name.get.downcase.include?('computer') || space_type.name.get.downcase.include?('datacenter')
         if elec_equip_have_info
           it_equipment_def = OpenStudio::Model::ElectricEquipmentITEAirCooledDefinition.new(model)
-          it_equipment_def.setName("IT equipment def")
+          it_equipment_def.setName('IT equipment def')
           it_equipment_def.setWattsperZoneFloorArea(OpenStudio.convert(elec_equip_per_area.to_f, 'W/ft^2', 'W/m^2').get)
           it_equipment_def.setDesignFanAirFlowRateperPowerInput(0.0001)
           it_equipment_def.setDesignFanPowerInputFraction(it_fan_power_ratio)
-          it_equipment_def.setDesignEnteringAirTemperature(22.5)    # recommended SAT 18-27C, use the middle T as design
-          it_equipment_def.setAirFlowCalculationMethod("FlowControlWithApproachTemperatures")
+          it_equipment_def.setDesignEnteringAirTemperature(22.5) # recommended SAT 18-27C, use the middle T as design
+          it_equipment_def.setAirFlowCalculationMethod('FlowControlWithApproachTemperatures')
           # Set the approach temperatures based on CFD simulation results
-          it_equipment_def.setSupplyTemperatureDifference(10.21)   # This is under fully open configuration assumption, based on the lookup table in scorecard
-          it_equipment_def.setReturnTemperatureDifference(-7.04)   # This is under fully open configuration assumption, based on the lookup table in scorecard
+          it_equipment_def.setSupplyTemperatureDifference(10.21) # This is under fully open configuration assumption, based on the lookup table in scorecard
+          it_equipment_def.setReturnTemperatureDifference(-7.04) # This is under fully open configuration assumption, based on the lookup table in scorecard
           # after the bug in OpenStudio core is fixed, this temperature schedules was enabled
-          it_equipment_def.setSupplyTemperatureDifferenceSchedule(model_add_schedule(model, 'SmallDataCenterLowITE SupplyApproachTemp_SCH'))   # This is under fully open configuration assumption, based on the lookup table in scorecard
+          it_equipment_def.setSupplyTemperatureDifferenceSchedule(model_add_schedule(model, 'SmallDataCenterLowITE SupplyApproachTemp_SCH')) # This is under fully open configuration assumption, based on the lookup table in scorecard
           it_equipment_def.setReturnTemperatureDifferenceSchedule(model_add_schedule(model, 'SmallDataCenterLowITE ReturnApproachTemp_SCH'))
 
           it_equipment = OpenStudio::Model::ElectricEquipmentITEAirCooled.new(it_equipment_def)
           it_equipment.setSpaceType(space_type)
-          it_equipment.setName("#{space_type.name.to_s} IT equipment")
+          it_equipment.setName("#{space_type.name} IT equipment")
           unless elec_equip_sch.nil?
             it_equipment.setDesignPowerInputSchedule(model_add_schedule(model, elec_equip_sch))
             OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set Design Power Input Schedule to #{elec_equip_sch}.")
@@ -71,6 +68,7 @@ module SmallDataCenterLowITE
     supply_temp_sch = get_crac_supply_temp_sch(model)
     model.getSetpointManagerScheduleds.each do |stpt_manager|
       next unless stpt_manager.name.to_s.downcase == 'crac supply air setpoint manager'
+
       stpt_manager.setSchedule(supply_temp_sch)
     end
   end
@@ -108,8 +106,8 @@ module SmallDataCenterLowITE
       supply_temp_diff_max = it_equip.supplyTemperatureDifference if it_equip.supplyTemperatureDifference > supply_temp_diff_max
       if supply_temp_diff_max > 0
         supply_temp_sch = model_add_constant_schedule_ruleset(model,
-                                                              it_equip.designEnteringAirTemperature-supply_temp_diff_max,
-                                                              name = "AHU Supply Temp Sch updated")
+                                                              it_equip.designEnteringAirTemperature - supply_temp_diff_max,
+                                                              name = 'AHU Supply Temp Sch updated')
       end
     end
 
@@ -117,12 +115,10 @@ module SmallDataCenterLowITE
   end
 
   def model_custom_swh_tweaks(model, building_type, climate_zone, prototype_input)
-
     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.SmallHotel.rb

@@ -1,4 +1,3 @@
-
 # Custom changes for the SmallHotel prototype.
 # These are changes that are inconsistent with other prototype
 # building types.
@@ -49,6 +48,9 @@ module SmallHotel
 
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
 
+    # Guestroom vacancy controls
+    model_add_guestroom_vacancy_controls(model, 'SmallHotel')
+
     return true
   end
 
@@ -65,7 +67,7 @@ module SmallHotel
     elec_equip.setName('Elevator Coreflr1 Elevator Lights/Fans Equipment')
     elec_equip.setSpace(elevator_coreflr1)
     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'
         # add elevator lift motor (not found in small hotel)
         elec_equip_def2 = OpenStudio::Model::ElectricEquipmentDefinition.new(model)
         elec_equip_def2.setName('Elevator CoreFlr1 Electric Equipment Definition2')
@@ -81,7 +83,7 @@ module SmallHotel
         case template
         when '90.1-2004', '90.1-2007'
           elec_equip.setSchedule(model_add_schedule(model, 'HotelSmall ELEV_LIGHT_FAN_SCH_24_7'))
-        when '90.1-2010', '90.1-2013'
+        when '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019'
           elec_equip.setSchedule(model_add_schedule(model, 'HotelSmall ELEV_LIGHT_FAN_SCH_ADD_DF'))
         end
 
@@ -93,9 +95,9 @@ module SmallHotel
 
   def update_waterheater_ambient_parameters(model)
     model.getWaterHeaterMixeds.sort.each do |water_heater|
-	  if water_heater.name.to_s.include?('200gal')
+      if water_heater.name.to_s.include?('200gal')
         water_heater.resetAmbientTemperatureSchedule
-        water_heater.setAmbientTemperatureIndicator('ThermalZone')		
+        water_heater.setAmbientTemperatureIndicator('ThermalZone')
         water_heater.setAmbientTemperatureThermalZone(model.getThermalZoneByName('LaundryRoomFlr1 ZN').get)
       end
     end
@@ -108,6 +110,8 @@ module SmallHotel
   end
 
   def model_custom_geometry_tweaks(building_type, climate_zone, prototype_input, model)
+    # Set original building North axis
+    model_set_building_north_axis(model, 90.0)
 
     return true
   end

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

@@ -1,4 +1,3 @@
-
 # Custom changes for the SmallOffice prototype.
 # These are changes that are inconsistent with other prototype
 # building types.
@@ -14,7 +13,7 @@ module SmallOffice
 
     # reset defrost time fraction
     # TODO: set this to a reasonable defrost time fraction based on research and implement in Prototype.CoilHeatingDXSingleSpeed
-    model.getCoilHeatingDXSingleSpeeds.each { |coil| coil.resetDefrostTimePeriodFraction }
+    model.getCoilHeatingDXSingleSpeeds.each(&:resetDefrostTimePeriodFraction)
 
     return true
   end
@@ -29,13 +28,17 @@ module SmallOffice
       if template == '90.1-2004'
         infiltration_per_zone_entrydoor = 0.129785425
         infiltration_entrydoor.setSchedule(model_add_schedule(model, 'OfficeSmall INFIL_Door_Opening_SCH'))
-      elsif template == '90.1-2007' || template == '90.1-2010'|| template == '90.1-2013'
+      elsif template == '90.1-2007' || 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-0B',
              'ASHRAE 169-2006-1B',
              'ASHRAE 169-2006-2A',
              'ASHRAE 169-2006-2B',
+             'ASHRAE 169-2013-0A',
              'ASHRAE 169-2013-1A',
+             'ASHRAE 169-2013-0B',
              'ASHRAE 169-2013-1B',
              'ASHRAE 169-2013-2A',
              'ASHRAE 169-2013-2B'
@@ -76,61 +79,85 @@ module SmallOffice
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Adjusting daylight sensor positions and fractions')
 
     adjustments = [
-                    { '90.1-2010' => { 'Perimeter_ZN_1' => { 'sensor_1_frac' => 0.02,
-                                                             'sensor_2_frac' => 0.1,
-                                                             'sensor_1_xyz' => [3.3236, 1.6002, 0.762],
-                                                             'sensor_2_xyz' => [8.9611, 1.6002, 0.762],
-																												},
-                                       'Perimeter_ZN_2' => { 'sensor_1_frac' => 0.06,
-                                                             'sensor_2_frac' => 0.15,
-                                                             'sensor_1_xyz' => [26.0898, 3.3236, 0.762],
-                                                             'sensor_2_xyz' => [26.0898, 9.23, 0.762],
-																												},
-                                       'Perimeter_ZN_3' => { 'sensor_1_frac' => 0.1,
-                                                             'sensor_2_frac' => 0.02,
-                                                             'sensor_1_xyz' => [13.8684, 16.8598, 0.762],
-                                                             'sensor_2_xyz' => [24.3664, 16.8598, 0.762],
-																												},
-                                       'Perimeter_ZN_4' => { 'sensor_1_frac' => 0.06,
-                                                             'sensor_2_frac' => 0.15,
-                                                             'sensor_1_xyz' => [1.6002, 15.1364, 0.762],
-                                                             'sensor_2_xyz' => [1.6002, 9.2446, 0.762],
-																												},
-                                      },
-                      '90.1-2013' => { 'Perimeter_ZN_1' => { 'sensor_1_frac' => 0.2399,
-                                                             'sensor_2_frac' => 0.0302,
-                                                             'sensor_1_xyz' => [9.144, 1.6337, 0.762],
-                                                             'sensor_2_xyz' => [9.144, 3.2675, 0.762],
-																												},
-                                       'Perimeter_ZN_2' => { 'sensor_1_frac' => 0.2399,
-                                                             'sensor_2_frac' => 0.0302,
-                                                             'sensor_1_xyz' => [26.0898, 9.144, 0.762],
-                                                             'sensor_2_xyz' => [24.4561, 9.144, 0.762],
-																												},
-                                       'Perimeter_ZN_3' => { 'sensor_1_frac' => 0.2399,
-                                                             'sensor_2_frac' => 0.0302,
-                                                             'sensor_1_xyz' => [18.288, 16.825, 0.762],
-                                                             'sensor_2_xyz' => [18.288, 15.1925, 0.762],
-																												},
-                                       'Perimeter_ZN_4' => { 'sensor_1_frac' => 0.2399,
-                                                             'sensor_2_frac' => 0.0302,
-                                                             'sensor_1_xyz' => [1.6337, 9.144, 0.762],
-                                                             'sensor_2_xyz' => [3.2675, 9.144, 0.762],
-																												},
-                                      },
-										}
-                  ]
+      { '90.1-2010' => { 'Perimeter_ZN_1' => { 'sensor_1_frac' => 0.02,
+                                               'sensor_2_frac' => 0.1,
+                                               'sensor_1_xyz' => [3.3236, 1.6002, 0.762],
+                                               'sensor_2_xyz' => [8.9611, 1.6002, 0.762] },
+                         'Perimeter_ZN_2' => { 'sensor_1_frac' => 0.06,
+                                               'sensor_2_frac' => 0.15,
+                                               'sensor_1_xyz' => [26.0898, 3.3236, 0.762],
+                                               'sensor_2_xyz' => [26.0898, 9.23, 0.762] },
+                         'Perimeter_ZN_3' => { 'sensor_1_frac' => 0.1,
+                                               'sensor_2_frac' => 0.02,
+                                               'sensor_1_xyz' => [13.8684, 16.8598, 0.762],
+                                               'sensor_2_xyz' => [24.3664, 16.8598, 0.762] },
+                         'Perimeter_ZN_4' => { 'sensor_1_frac' => 0.06,
+                                               'sensor_2_frac' => 0.15,
+                                               'sensor_1_xyz' => [1.6002, 15.1364, 0.762],
+                                               'sensor_2_xyz' => [1.6002, 9.2446, 0.762] } },
+        '90.1-2013' => { 'Perimeter_ZN_1' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [9.144, 1.6337, 0.762],
+                                               'sensor_2_xyz' => [9.144, 3.2675, 0.762] },
+                         'Perimeter_ZN_2' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [26.0898, 9.144, 0.762],
+                                               'sensor_2_xyz' => [24.4561, 9.144, 0.762] },
+                         'Perimeter_ZN_3' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [18.288, 16.825, 0.762],
+                                               'sensor_2_xyz' => [18.288, 15.1925, 0.762] },
+                         'Perimeter_ZN_4' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [1.6337, 9.144, 0.762],
+                                               'sensor_2_xyz' => [3.2675, 9.144, 0.762] } },
+        '90.1-2016' => { 'Perimeter_ZN_1' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [9.144, 1.6337, 0.762],
+                                               'sensor_2_xyz' => [9.144, 3.2675, 0.762] },
+                         'Perimeter_ZN_2' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [26.0898, 9.144, 0.762],
+                                               'sensor_2_xyz' => [24.4561, 9.144, 0.762] },
+                         'Perimeter_ZN_3' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [18.288, 16.825, 0.762],
+                                               'sensor_2_xyz' => [18.288, 15.1925, 0.762] },
+                         'Perimeter_ZN_4' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [1.6337, 9.144, 0.762],
+                                               'sensor_2_xyz' => [3.2675, 9.144, 0.762] } },
+        '90.1-2019' => { 'Perimeter_ZN_1' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [9.144, 1.6337, 0.762],
+                                               'sensor_2_xyz' => [9.144, 3.2675, 0.762] },
+                         'Perimeter_ZN_2' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [26.0898, 9.144, 0.762],
+                                               'sensor_2_xyz' => [24.4561, 9.144, 0.762] },
+                         'Perimeter_ZN_3' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [18.288, 16.825, 0.762],
+                                               'sensor_2_xyz' => [18.288, 15.1925, 0.762] },
+                         'Perimeter_ZN_4' => { 'sensor_1_frac' => 0.2399,
+                                               'sensor_2_frac' => 0.0302,
+                                               'sensor_1_xyz' => [1.6337, 9.144, 0.762],
+                                               'sensor_2_xyz' => [3.2675, 9.144, 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
@@ -170,11 +197,12 @@ module SmallOffice
   end
 
   def model_custom_swh_tweaks(model, building_type, climate_zone, prototype_input)
-
     return true
   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

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

@@ -1,5 +1,4 @@
-
-# Custom changes for the SmallOffice prototype.
+# Custom changes for the SmallOfficeDetailed prototype.
 # These are changes that are inconsistent with other prototype
 # building types.
 module SmallOfficeDetailed
@@ -14,7 +13,7 @@ module SmallOfficeDetailed
 
     # reset defrost time fraction
     # TODO: set this to a reasonable defrost time fraction based on research and implement in Prototype.CoilHeatingDXSingleSpeed
-    model.getCoilHeatingDXSingleSpeeds.each { |coil| coil.resetDefrostTimePeriodFraction }
+    model.getCoilHeatingDXSingleSpeeds.each(&:resetDefrostTimePeriodFraction)
 
     return true
   end
@@ -29,7 +28,7 @@ module SmallOfficeDetailed
       if template == '90.1-2004'
         infiltration_per_zone_entrydoor = 0.129785425
         infiltration_entrydoor.setSchedule(model_add_schedule(model, 'OfficeSmall INFIL_Door_Opening_SCH'))
-      elsif template == '90.1-2007' || template == '90.1-2010'|| template == '90.1-2013'
+      elsif template == '90.1-2007' || template == '90.1-2010' || template == '90.1-2013' || template == '90.1-2016' || template == '90.1-2019'
         case climate_zone
         when 'ASHRAE 169-2006-1A', 'ASHRAE 169-2006-2A', 'ASHRAE 169-2006-1B', 'ASHRAE 169-2006-2B'
           infiltration_per_zone_entrydoor = 0.129785425
@@ -65,65 +64,64 @@ module SmallOfficeDetailed
     end
   end
 
-#  def model_custom_daylighting_tweaks(building_type, climate_zone, prototype_input, model)
-#    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Adjusting daylight sensor positions and fractions')
-#
-#    adjustments = [
-#                    { 'stds_spc_type' => 'WholeBuilding - Sm Office',
-#                      'sensor_1_frac' => 0.2399,
-#                      'sensor_2_frac' => 0.0302,
-#                    }
-#                  ]
-#
-#    # Adjust daylight sensors in each space
-#   model.getSpaces.each do |space|
-#      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
-#      adjustments.each do |adj|
-#        next unless adj['stds_spc_type'] == stds_spc_type
-#        # Adjust the primary sensor
-#        if adj['sensor_1_frac'] && zone.primaryDaylightingControl.is_initialized
-#          OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "For #{zone.name}: Adjusting primary daylight sensor to control #{adj['sensor_1_frac']} of the lighting.")
-#          zone.setFractionofZoneControlledbyPrimaryDaylightingControl(adj['sensor_1_frac'])
-#          pri_ctrl = zone.primaryDaylightingControl.get
-#          if adj['sensor_1_xyz']
-#            x = adj['sensor_1_xyz'][0]
-#            y = adj['sensor_1_xyz'][1]
-#            z = adj['sensor_1_xyz'][2]
-#            OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "For #{zone.name}: Adjusting primary daylight sensor position to [#{x}, #{y}, #{z}].")
-#            pri_ctrl.setPositionXCoordinate(x)
-#            pri_ctrl.setPositionYCoordinate(y)
-#            pri_ctrl.setPositionZCoordinate(z)
-#          end
-#        end
-        # Adjust the secondary sensor
-#        if adj['sensor_2_frac'] && zone.secondaryDaylightingControl.is_initialized
-#          OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "For #{zone.name}: Adjusting secondary daylight sensor to control #{adj['sensor_2_frac']} of the lighting.")
-#          zone.setFractionofZoneControlledbySecondaryDaylightingControl(adj['sensor_2_frac'])
-#          sec_ctrl = zone.secondaryDaylightingControl.get
-#          if adj['sensor_2_xyz']
-#            x = adj['sensor_2_xyz'][0]
-#            y = adj['sensor_2_xyz'][1]
-#            z = adj['sensor_2_xyz'][2]
-#            OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "For #{zone.name}: Adjusting secondary daylight sensor position to [#{x}, #{y}, #{z}].")
-#            sec_ctrl.setPositionXCoordinate(x)
-#            sec_ctrl.setPositionYCoordinate(y)
-#            sec_ctrl.setPositionZCoordinate(z)
-#          end
-#        end
-
-#     end
-#   end
-#   return true
-# end
+  # def model_custom_daylighting_tweaks(building_type, climate_zone, prototype_input, model)
+  #   OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Adjusting daylight sensor positions and fractions')
+  #
+  #   adjustments = [
+  #                   { 'stds_spc_type' => 'WholeBuilding - Sm Office',
+  #                     'sensor_1_frac' => 0.2399,
+  #                     'sensor_2_frac' => 0.0302,
+  #                   }
+  #                 ]
+  #
+  #   # Adjust daylight sensors in each space
+  #   model.getSpaces.each do |space|
+  #     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
+  #     adjustments.each do |adj|
+  #       next unless adj['stds_spc_type'] == stds_spc_type
+  #       # Adjust the primary sensor
+  #       if adj['sensor_1_frac'] && zone.primaryDaylightingControl.is_initialized
+  #         OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "For #{zone.name}: Adjusting primary daylight sensor to control #{adj['sensor_1_frac']} of the lighting.")
+  #         zone.setFractionofZoneControlledbyPrimaryDaylightingControl(adj['sensor_1_frac'])
+  #         pri_ctrl = zone.primaryDaylightingControl.get
+  #         if adj['sensor_1_xyz']
+  #           x = adj['sensor_1_xyz'][0]
+  #           y = adj['sensor_1_xyz'][1]
+  #           z = adj['sensor_1_xyz'][2]
+  #           OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "For #{zone.name}: Adjusting primary daylight sensor position to [#{x}, #{y}, #{z}].")
+  #           pri_ctrl.setPositionXCoordinate(x)
+  #           pri_ctrl.setPositionYCoordinate(y)
+  #           pri_ctrl.setPositionZCoordinate(z)
+  #         end
+  #       end
+  #       # Adjust the secondary sensor
+  #       if adj['sensor_2_frac'] && zone.secondaryDaylightingControl.is_initialized
+  #         OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "For #{zone.name}: Adjusting secondary daylight sensor to control #{adj['sensor_2_frac']} of the lighting.")
+  #         zone.setFractionofZoneControlledbySecondaryDaylightingControl(adj['sensor_2_frac'])
+  #         sec_ctrl = zone.secondaryDaylightingControl.get
+  #         if adj['sensor_2_xyz']
+  #           x = adj['sensor_2_xyz'][0]
+  #           y = adj['sensor_2_xyz'][1]
+  #           z = adj['sensor_2_xyz'][2]
+  #           OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "For #{zone.name}: Adjusting secondary daylight sensor position to [#{x}, #{y}, #{z}].")
+  #           sec_ctrl.setPositionXCoordinate(x)
+  #           sec_ctrl.setPositionYCoordinate(y)
+  #           sec_ctrl.setPositionZCoordinate(z)
+  #         end
+  #       end
+  #     end
+  #   end
+  #   return true
+  # end
 
   def update_waterheater_loss_coefficient(model)
     case template
-    when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', 'NECB2011'
+    when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019', 'NECB2011'
       model.getWaterHeaterMixeds.sort.each do |water_heater|
         water_heater.setOffCycleLossCoefficienttoAmbientTemperature(1.205980747)
         water_heater.setOnCycleLossCoefficienttoAmbientTemperature(1.205980747)
@@ -138,6 +136,8 @@ module SmallOfficeDetailed
   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