openstudio-standards 0.1.9 → 0.1.10

data/lib/openstudio-standards/prototypes/Prototype.primary_school.rb

@@ -1,7 +1,8 @@
 
-# Extend the class to add Secondary School specific stuff
-class OpenStudio::Model::Model
-  def define_space_type_map(building_type, template, climate_zone)
+# Modules for building-type specific methods
+module PrototypeBuilding
+module PrimarySchool
+  def self.define_space_type_map(building_type, template, climate_zone)
     space_type_map = nil
     case template
     when 'NECB 2011'
@@ -35,89 +36,9 @@ class OpenStudio::Model::Model
     return space_type_map
   end
 
-  def define_hvac_system_map(building_type, template, climate_zone)
+  def self.define_hvac_system_map(building_type, template, climate_zone)
     system_to_space_map = nil
 
-    # case template
-    # when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
-    # system_to_space_map = [
-    # {
-    # 'type' => 'PVAV',
-    # 'name' => 'PVAV_POD_1',
-    # 'space_names' =>
-    # [
-    # 'Corner_Class_1_Pod_1_ZN_1_FLR_1',
-    # 'Mult_Class_1_Pod_1_ZN_1_FLR_1',
-    # 'Corridor_Pod_1_ZN_1_FLR_1',
-    # 'Corner_Class_2_Pod_1_ZN_1_FLR_1',
-    # 'Mult_Class_2_Pod_1_ZN_1_FLR_1',
-    # 'Corner_Class_1_Pod_2_ZN_1_FLR_1'
-    # ]
-    # },
-    # {
-    # 'type' => 'PVAV',
-    # 'name' => 'PVAV_POD_2',
-    # 'space_names' =>
-    # [
-    # 'Mult_Class_1_Pod_2_ZN_1_FLR_1',
-    # 'Corridor_Pod_2_ZN_1_FLR_1',
-    # 'Corner_Class_2_Pod_2_ZN_1_FLR_1',
-    # 'Mult_Class_2_Pod_2_ZN_1_FLR_1'
-    # ]
-    # },
-    # {
-    # 'type' => 'PVAV',
-    # 'name' => 'PVAV_POD_3',
-    # 'space_names' =>
-    # [
-    # 'Corner_Class_1_Pod_3_ZN_1_FLR_1',
-    # 'Mult_Class_1_Pod_3_ZN_1_FLR_1',
-    # 'Corridor_Pod_3_ZN_1_FLR_1',
-    # 'Corner_Class_2_Pod_3_ZN_1_FLR_1',
-    # 'Mult_Class_2_Pod_3_ZN_1_FLR_1'
-    # ]
-    # },
-    # {
-    # 'type' => 'PVAV',
-    # 'name' => 'PVAV_OTHER',
-    # 'space_names' =>
-    # [
-    # 'Computer_Class_ZN_1_FLR_1',
-    # 'Main_Corridor_ZN_1_FLR_1',
-    # 'Lobby_ZN_1_FLR_1',
-    # 'Mech_ZN_1_FLR_1',
-    # 'Bath_ZN_1_FLR_1',
-    # 'Offices_ZN_1_FLR_1',
-    # 'Library_Media_Center_ZN_1_FLR_1'
-    # ]
-    # },
-    # {
-    # 'type' => 'PSZ-AC',
-    # 'name' => 'PSZ-AC_1-6',
-    # 'space_names' =>
-    # [
-    # 'Kitchen_ZN_1_FLR_1'
-    # ]
-    # },
-    # {
-    # 'type' => 'PSZ-AC',
-    # 'name' => 'PSZ-AC_2-5',
-    # 'space_names' =>
-    # [
-    # 'Gym_ZN_1_FLR_1'
-    # ]
-    # },
-    # {
-    # 'type' => 'PSZ-AC',
-    # 'name' => 'PSZ-AC_2-7',
-    # 'space_names' =>
-    # [
-    # 'Cafeteria_ZN_1_FLR_1'
-    # ]
-    # }
-    # ]
-
-    # when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
     system_to_space_map = [
       {
         'type' => 'PVAV',
@@ -229,16 +150,15 @@ class OpenStudio::Model::Model
       }
     ]
 
-    # end
-
     return system_to_space_map
   end
 
-  def custom_hvac_tweaks(building_type, template, climate_zone, prototype_input)
+  def self.custom_hvac_tweaks(building_type, template, climate_zone, prototype_input, model)
     return true
   end
 
-  def custom_swh_tweaks(building_type, template, climate_zone, prototype_input)
+  def self.custom_swh_tweaks(building_type, template, climate_zone, prototype_input, model)
     return true
   end
 end
+end

data/lib/openstudio-standards/prototypes/Prototype.quick_service_restaurant.rb

@@ -1,7 +1,8 @@
 
-# Extend the class to add Medium Office specific stuff
-class OpenStudio::Model::Model
-  def define_space_type_map(building_type, template, climate_zone)
+# Modules for building-type specific methods
+module PrototypeBuilding
+module QuickServiceRestaurant
+  def self.define_space_type_map(building_type, template, climate_zone)
     space_type_map = nil
     case template
     when 'DOE Ref Pre-1980'
@@ -26,7 +27,7 @@ class OpenStudio::Model::Model
     return space_type_map
   end
 
-  def define_hvac_system_map(building_type, template, climate_zone)
+  def self.define_hvac_system_map(building_type, template, climate_zone)
     case template
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
       system_to_space_map = [
@@ -309,75 +310,75 @@ class OpenStudio::Model::Model
     return system_to_space_map
   end
 
-  def custom_hvac_tweaks(building_type, template, climate_zone, prototype_input)
+  def self.custom_hvac_tweaks(building_type, template, climate_zone, prototype_input, model)
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
 
     # add extra equipment for kitchen
-    add_extra_equip_kitchen(template)
+    PrototypeBuilding::QuickServiceRestaurant.add_extra_equip_kitchen(template, model)
     # add extra infiltration for dining room door and attic
-    add_door_infiltration(template, climate_zone)
+    PrototypeBuilding::QuickServiceRestaurant.add_door_infiltration(template, climate_zone, model)
     # add zone_mixing between kitchen and dining
-    add_zone_mixing(template)
+    PrototypeBuilding::QuickServiceRestaurant.add_zone_mixing(template, model)
     # Update Sizing Zone
-    update_sizing_zone(template)
+    PrototypeBuilding::QuickServiceRestaurant.update_sizing_zone(template, model)
     # adjust the cooling setpoint
-    adjust_clg_setpoint(template, climate_zone)
+    PrototypeBuilding::QuickServiceRestaurant.adjust_clg_setpoint(template, climate_zone, model)
     # reset the design OA of kitchen
-    reset_kitchen_oa(template)
+    PrototypeBuilding::QuickServiceRestaurant.reset_kitchen_oa(template, model)
 
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
 
     return true
   end
 
-  def add_door_infiltration(template, climate_zone)
+  def self.add_door_infiltration(template, climate_zone, model)
     # add extra infiltration for dining room door and attic (there is no attic in 'DOE Ref Pre-1980')
     unless template == 'DOE Ref 1980-2004' || template == 'DOE Ref Pre-1980'
-      dining_space = getSpaceByName('Dining').get
-      attic_space = getSpaceByName('Attic').get
-      infiltration_diningdoor = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(self)
-      infiltration_attic = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(self)
+      dining_space = model.getSpaceByName('Dining').get
+      attic_space = model.getSpaceByName('Attic').get
+      infiltration_diningdoor = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(model)
+      infiltration_attic = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(model)
       infiltration_diningdoor.setName('Dining door Infiltration')
       infiltration_per_zone_diningdoor = 0
       infiltration_per_zone_attic = 0.0729
       if template == '90.1-2004'
         infiltration_per_zone_diningdoor = 0.902834611
-        infiltration_diningdoor.setSchedule(add_schedule('RestaurantFastFood DOOR_INFIL_SCH'))
+        infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantFastFood DOOR_INFIL_SCH'))
       elsif template == '90.1-2007'
         case climate_zone
         when '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-2006-4A', 'ASHRAE 169-2006-4B', 'ASHRAE 169-2006-4C'
           infiltration_per_zone_diningdoor = 0.902834611
-          infiltration_diningdoor.setSchedule(add_schedule('RestaurantFastFood DOOR_INFIL_SCH'))
+          infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantFastFood DOOR_INFIL_SCH'))
         else
           infiltration_per_zone_diningdoor = 0.583798439
-          infiltration_diningdoor.setSchedule(add_schedule('RestaurantFastFood VESTIBULE_DOOR_INFIL_SCH'))
+          infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantFastFood VESTIBULE_DOOR_INFIL_SCH'))
         end
       elsif template == '90.1-2010' || template == '90.1-2013'
         case climate_zone
         when 'ASHRAE 169-2006-1A', 'ASHRAE 169-2006-2A', 'ASHRAE 169-2006-2B', 'ASHRAE 169-2006-3A', 'ASHRAE 169-2006-3B', 'ASHRAE 169-2006-3C'
           infiltration_per_zone_diningdoor = 0.902834611
-          infiltration_diningdoor.setSchedule(add_schedule('RestaurantFastFood DOOR_INFIL_SCH'))
+          infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantFastFood DOOR_INFIL_SCH'))
         else
           infiltration_per_zone_diningdoor = 0.583798439
-          infiltration_diningdoor.setSchedule(add_schedule('RestaurantFastFood VESTIBULE_DOOR_INFIL_SCH'))
+          infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantFastFood VESTIBULE_DOOR_INFIL_SCH'))
         end
       end
       infiltration_diningdoor.setDesignFlowRate(infiltration_per_zone_diningdoor)
       infiltration_diningdoor.setSpace(dining_space)
       infiltration_attic.setDesignFlowRate(infiltration_per_zone_attic)
-      infiltration_attic.setSchedule(add_schedule('Always On'))
+      infiltration_attic.setSchedule(model.add_schedule('Always On'))
       infiltration_attic.setSpace(attic_space)
     end
   end
 
   # add extra equipment for kitchen
-  def add_extra_equip_kitchen(template)
-    kitchen_space = getSpaceByName('Kitchen')
+  def self.add_extra_equip_kitchen(template, model)
+    kitchen_space = model.getSpaceByName('Kitchen')
     kitchen_space = kitchen_space.get
     kitchen_space_type = kitchen_space.spaceType.get
-    elec_equip_def1 = OpenStudio::Model::ElectricEquipmentDefinition.new(self)
-    elec_equip_def2 = OpenStudio::Model::ElectricEquipmentDefinition.new(self)
+    elec_equip_def1 = OpenStudio::Model::ElectricEquipmentDefinition.new(model)
+    elec_equip_def2 = OpenStudio::Model::ElectricEquipmentDefinition.new(model)
     elec_equip_def1.setName('Kitchen Electric Equipment Definition1')
     elec_equip_def2.setName('Kitchen Electric Equipment Definition2')
     case template
@@ -402,8 +403,8 @@ class OpenStudio::Model::Model
       elec_equip2.setName('Kitchen_Reach-in-Refrigerator')
       elec_equip1.setSpaceType(kitchen_space_type)
       elec_equip2.setSpaceType(kitchen_space_type)
-      elec_equip1.setSchedule(add_schedule('RestaurantFastFood ALWAYS_ON'))
-      elec_equip2.setSchedule(add_schedule('RestaurantFastFood ALWAYS_ON'))
+      elec_equip1.setSchedule(model.add_schedule('RestaurantFastFood ALWAYS_ON'))
+      elec_equip2.setSchedule(model.add_schedule('RestaurantFastFood ALWAYS_ON'))
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
       elec_equip_def1.setDesignLevel(577)
       elec_equip_def1.setFractionLatent(0)
@@ -413,42 +414,42 @@ class OpenStudio::Model::Model
       elec_equip1 = OpenStudio::Model::ElectricEquipment.new(elec_equip_def1)
       elec_equip1.setName('Kitchen_ExhFan_Equip')
       elec_equip1.setSpaceType(kitchen_space_type)
-      elec_equip1.setSchedule(add_schedule('RestaurantFastFood Kitchen_Exhaust_SCH'))
+      elec_equip1.setSchedule(model.add_schedule('RestaurantFastFood Kitchen_Exhaust_SCH'))
     end
   end
 
-  def update_sizing_zone(template)
+  def self.update_sizing_zone(template, model)
     case template
     when '90.1-2007', '90.1-2010', '90.1-2013'
-      zone_sizing = getSpaceByName('Dining').get.thermalZone.get.sizingZone
+      zone_sizing = model.getSpaceByName('Dining').get.thermalZone.get.sizingZone
       zone_sizing.setCoolingDesignAirFlowMethod('DesignDayWithLimit')
       zone_sizing.setCoolingMinimumAirFlowperZoneFloorArea(0.003581176)
-      zone_sizing = getSpaceByName('Kitchen').get.thermalZone.get.sizingZone
+      zone_sizing = model.getSpaceByName('Kitchen').get.thermalZone.get.sizingZone
       zone_sizing.setCoolingDesignAirFlowMethod('DesignDayWithLimit')
       zone_sizing.setCoolingMinimumAirFlowperZoneFloorArea(0)
     when '90.1-2004'
-      zone_sizing = getSpaceByName('Dining').get.thermalZone.get.sizingZone
+      zone_sizing = model.getSpaceByName('Dining').get.thermalZone.get.sizingZone
       zone_sizing.setCoolingDesignAirFlowMethod('DesignDayWithLimit')
       zone_sizing.setCoolingMinimumAirFlowperZoneFloorArea(0.007111554)
-      zone_sizing = getSpaceByName('Kitchen').get.thermalZone.get.sizingZone
+      zone_sizing = model.getSpaceByName('Kitchen').get.thermalZone.get.sizingZone
       zone_sizing.setCoolingDesignAirFlowMethod('DesignDayWithLimit')
       zone_sizing.setCoolingMinimumAirFlowperZoneFloorArea(0)
     end
   end
 
-  def adjust_clg_setpoint(template, climate_zone)
+  def self.adjust_clg_setpoint(template, climate_zone, model)
     ['Dining', 'Kitchen'].each do |space_name|
-      space_type_name = getSpaceByName(space_name).get.spaceType.get.name.get
+      space_type_name = model.getSpaceByName(space_name).get.spaceType.get.name.get
       thermostat_name = space_type_name + ' Thermostat'
-      thermostat = getThermostatSetpointDualSetpointByName(thermostat_name).get
+      thermostat = model.getThermostatSetpointDualSetpointByName(thermostat_name).get
       case template
       when '90.1-2004', '90.1-2007', '90.1-2010'
         if climate_zone == 'ASHRAE 169-2006-2B' || climate_zone == 'ASHRAE 169-2006-1B' || climate_zone == 'ASHRAE 169-2006-3B'
           case space_name
           when 'Dining'
-            thermostat.setCoolingSetpointTemperatureSchedule(add_schedule('RestaurantFastFood CLGSETP_SCH_NO_OPTIMUM'))
+            thermostat.setCoolingSetpointTemperatureSchedule(model.add_schedule('RestaurantFastFood CLGSETP_SCH_NO_OPTIMUM'))
           when 'Kitchen'
-            thermostat.setCoolingSetpointTemperatureSchedule(add_schedule('RestaurantFastFood CLGSETP_KITCHEN_SCH_NO_OPTIMUM'))
+            thermostat.setCoolingSetpointTemperatureSchedule(model.add_schedule('RestaurantFastFood CLGSETP_KITCHEN_SCH_NO_OPTIMUM'))
           end
         end
       end
@@ -458,8 +459,8 @@ class OpenStudio::Model::Model
   # In order to provide sufficient OSA to replace exhaust flow through kitchen hoods (3,300 cfm),
   # modeled OSA to kitchen is different from OSA determined based on ASHRAE  62.1.
   # It takes into account the available OSA in dining as transfer air.
-  def reset_kitchen_oa(template)
-    space_kitchen = getSpaceByName('Kitchen').get
+  def self.reset_kitchen_oa(template, model)
+    space_kitchen = model.getSpaceByName('Kitchen').get
     ventilation = space_kitchen.designSpecificationOutdoorAir.get
     ventilation.setOutdoorAirFlowperPerson(0)
     ventilation.setOutdoorAirFlowperFloorArea(0)
@@ -471,10 +472,10 @@ class OpenStudio::Model::Model
     end
   end
 
-  def update_exhaust_fan_efficiency(template)
+  def self.update_exhaust_fan_efficiency(template, model)
     case template
     when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
-      getFanZoneExhausts.sort.each do |exhaust_fan|
+      model.getFanZoneExhausts.sort.each do |exhaust_fan|
         fan_name = exhaust_fan.name.to_s
         if fan_name.include? 'Dining'
           exhaust_fan.setFanEfficiency(1)
@@ -482,21 +483,21 @@ class OpenStudio::Model::Model
         end
       end
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
-      getFanZoneExhausts.sort.each do |exhaust_fan|
+      model.getFanZoneExhausts.sort.each do |exhaust_fan|
         exhaust_fan.setFanEfficiency(1)
         exhaust_fan.setPressureRise(0.000001)
       end
     end
   end
 
-  def add_zone_mixing(template)
+  def self.add_zone_mixing(template, model)
     # add zone_mixing between kitchen and dining
-    space_kitchen = getSpaceByName('Kitchen').get
+    space_kitchen = model.getSpaceByName('Kitchen').get
     zone_kitchen = space_kitchen.thermalZone.get
-    space_dining = getSpaceByName('Dining').get
+    space_dining = model.getSpaceByName('Dining').get
     zone_dining = space_dining.thermalZone.get
     zone_mixing_kitchen = OpenStudio::Model::ZoneMixing.new(zone_kitchen)
-    zone_mixing_kitchen.setSchedule(add_schedule('RestaurantFastFood Hours_of_operation'))
+    zone_mixing_kitchen.setSchedule(model.add_schedule('RestaurantFastFood Hours_of_operation'))
     case template
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
       zone_mixing_kitchen.setDesignFlowRate(0.834532374)
@@ -509,19 +510,20 @@ class OpenStudio::Model::Model
     zone_mixing_kitchen.setDeltaTemperature(0)
   end
 
-  def update_waterheater_loss_coefficient(template)
+  def self.update_waterheater_loss_coefficient(template, model)
     case template
     when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', 'NECB 2011'
-      getWaterHeaterMixeds.sort.each do |water_heater|
+      model.getWaterHeaterMixeds.sort.each do |water_heater|
         water_heater.setOffCycleLossCoefficienttoAmbientTemperature(7.561562668)
         water_heater.setOnCycleLossCoefficienttoAmbientTemperature(7.561562668)
       end
     end
   end
 
-  def custom_swh_tweaks(building_type, template, climate_zone, prototype_input)
-    update_waterheater_loss_coefficient(template)
+  def self.custom_swh_tweaks(building_type, template, climate_zone, prototype_input, model)
+    PrototypeBuilding::QuickServiceRestaurant.update_waterheater_loss_coefficient(template, model)
 
     return true
   end
 end
+end

data/lib/openstudio-standards/prototypes/Prototype.retail_standalone.rb

@@ -1,12 +1,13 @@
 
 # Extend the class to add Medium Office specific stuff
-class OpenStudio::Model::Model
+module PrototypeBuilding
+module RetailStandalone
   # TODO: The ElectricEquipment schedules are wrong in OpenStudio Standards... It needs to be 'RetailStandalone BLDG_EQUIP_SCH' for 90.1-2010 at least but probably all
   # TODO: There is an OpenStudio bug where two heat exchangers are on the equipment list and it references the same single heat exchanger for both. This doubles the heat recovery energy.
   # TODO: The HeatExchangerAirToAir is not calculating correctly. It does not equal the legacy IDF and has higher energy usage due to that.
   # TODO: Need to determine if WaterHeater can be alone or if we need to 'fake' it.
 
-  def define_space_type_map(building_type, template, climate_zone)
+  def self.define_space_type_map(building_type, template, climate_zone)
     space_type_map = nil
     case template
     when 'NECB 2011'
@@ -28,7 +29,7 @@ class OpenStudio::Model::Model
     return space_type_map
   end
 
-  def define_hvac_system_map(building_type, template, climate_zone)
+  def self.define_hvac_system_map(building_type, template, climate_zone)
     system_to_space_map = [
       {
         'type' => 'PSZ-AC',
@@ -42,18 +43,18 @@ class OpenStudio::Model::Model
     return system_to_space_map
   end
 
-  def custom_hvac_tweaks(building_type, template, climate_zone, prototype_input)
+  def self.custom_hvac_tweaks(building_type, template, climate_zone, prototype_input, model)
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
 
     # Add the door infiltration for template 2004,2007,2010,2013
     case template
     when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
-      entry_space = getSpaceByName('Front_Entry').get
-      infiltration_entry = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(self)
+      entry_space = model.getSpaceByName('Front_Entry').get
+      infiltration_entry = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(model)
       infiltration_entry.setName('Entry door Infiltration')
       infiltration_per_zone = 1.418672682
       infiltration_entry.setDesignFlowRate(infiltration_per_zone)
-      infiltration_entry.setSchedule(add_schedule('RetailStandalone INFIL_Door_Opening_SCH'))
+      infiltration_entry.setSchedule(model.add_schedule('RetailStandalone INFIL_Door_Opening_SCH'))
       infiltration_entry.setSpace(entry_space)
     end
 
@@ -62,19 +63,20 @@ class OpenStudio::Model::Model
     return true
   end
 
-  def update_waterheater_loss_coefficient(template)
+  def self.update_waterheater_loss_coefficient(template, model)
     case template
     when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', 'NECB 2011'
-      getWaterHeaterMixeds.sort.each do |water_heater|
+      model.getWaterHeaterMixeds.sort.each do |water_heater|
         water_heater.setOffCycleLossCoefficienttoAmbientTemperature(4.10807252)
         water_heater.setOnCycleLossCoefficienttoAmbientTemperature(4.10807252)
       end
     end
   end
 
-  def custom_swh_tweaks(building_type, template, climate_zone, prototype_input)
-    update_waterheater_loss_coefficient(template)
+  def self.custom_swh_tweaks(building_type, template, climate_zone, prototype_input, model)
+    PrototypeBuilding::RetailStandalone.update_waterheater_loss_coefficient(template, model)
 
     return true
   end
 end
+end

data/lib/openstudio-standards/prototypes/Prototype.retail_stripmall.rb

@@ -1,7 +1,8 @@
 
-# Extend the class to add Medium Office specific stuff
-class OpenStudio::Model::Model
-  def define_space_type_map(building_type, template, climate_zone)
+# Modules for building-type specific methods
+module PrototypeBuilding
+module RetailStripmall
+  def self.define_space_type_map(building_type, template, climate_zone)
     space_type_map = nil
     case template
 
@@ -20,7 +21,7 @@ class OpenStudio::Model::Model
     return space_type_map
   end
 
-  def define_hvac_system_map(building_type, template, climate_zone)
+  def self.define_hvac_system_map(building_type, template, climate_zone)
     system_to_space_map = [
       {
         'type' => 'PSZ-AC',
@@ -84,10 +85,10 @@ class OpenStudio::Model::Model
     return system_to_space_map
   end
 
-  def custom_hvac_tweaks(building_type, template, climate_zone, prototype_input)
+  def self.custom_hvac_tweaks(building_type, template, climate_zone, prototype_input, model)
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
 
-    system_to_space_map = define_hvac_system_map(building_type, template, climate_zone)
+    system_to_space_map = PrototypeBuilding::RetailStripmall.define_hvac_system_map(building_type, template, climate_zone)
 
     # Add infiltration door opening
     # Spaces names to design infiltration rates (m3/s)
@@ -98,13 +99,13 @@ class OpenStudio::Model::Model
 
       door_infiltration_map.each_pair do |space_names, infiltration_design_flowrate|
         space_names.each do |space_name|
-          space = getSpaceByName(space_name).get
+          space = model.getSpaceByName(space_name).get
           # Create the infiltration object and hook it up to the space type
-          infiltration = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(self)
+          infiltration = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(model)
           infiltration.setName("#{space_name} Door Open Infiltration")
           infiltration.setSpace(space)
           infiltration.setDesignFlowRate(infiltration_design_flowrate)
-          infiltration_schedule = add_schedule('RetailStripmall INFIL_Door_Opening_SCH')
+          infiltration_schedule = model.add_schedule('RetailStripmall INFIL_Door_Opening_SCH')
           if infiltration_schedule.nil?
             OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "Can't find schedule (RetailStripmall INFIL_Door_Opening_SCH).")
             return false
@@ -119,19 +120,20 @@ class OpenStudio::Model::Model
     return true
   end # add hvac
 
-  def update_waterheater_loss_coefficient(template)
+  def self.update_waterheater_loss_coefficient(template, model)
     case template
     when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', 'NECB 2011'
-      getWaterHeaterMixeds.sort.each do |water_heater|
+      model.getWaterHeaterMixeds.sort.each do |water_heater|
         water_heater.setOffCycleLossCoefficienttoAmbientTemperature(1.205980747)
         water_heater.setOnCycleLossCoefficienttoAmbientTemperature(1.205980747)
       end
     end
   end
 
-  def custom_swh_tweaks(building_type, template, climate_zone, prototype_input)
-    update_waterheater_loss_coefficient(template)
+  def self.custom_swh_tweaks(building_type, template, climate_zone, prototype_input, model)
+    PrototypeBuilding::RetailStripmall.update_waterheater_loss_coefficient(template, model)
 
     return true
   end
 end
+end