openstudio-standards 0.1.9 → 0.1.10

data/lib/openstudio-standards/prototypes/Prototype.full_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 FullServiceRestaurant
+  def self.define_space_type_map(building_type, template, climate_zone)
     space_type_map = nil
     case template
     when 'DOE Ref Pre-1980'
@@ -27,7 +28,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 = [
@@ -449,72 +450,72 @@ 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::FullServiceRestaurant.add_extra_equip_kitchen(template, model)
     # add extra infiltration for dining room door and attic
-    add_door_infiltration(template, climate_zone)
+    PrototypeBuilding::FullServiceRestaurant.add_door_infiltration(template, climate_zone, model)
     # add zone_mixing between kitchen and dining
-    add_zone_mixing(template)
+    PrototypeBuilding::FullServiceRestaurant.add_zone_mixing(template, model)
     # Update Sizing Zone
-    update_sizing_zone(template)
+    PrototypeBuilding::FullServiceRestaurant.update_sizing_zone(template, model)
     # adjust the cooling setpoint
-    adjust_clg_setpoint(template, climate_zone)
+    PrototypeBuilding::FullServiceRestaurant.adjust_clg_setpoint(template, climate_zone, model)
     # reset the design OA of kitchen
-    reset_kitchen_oa(template)
+    PrototypeBuilding::FullServiceRestaurant.reset_kitchen_oa(template, model)
 
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
 
     return true
   end # add hvac
 
-  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' || template == 'NECB 2011'
-      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.2378
       if template == '90.1-2004'
         infiltration_per_zone_diningdoor = 0.614474994
-        infiltration_diningdoor.setSchedule(add_schedule('RestaurantSitDown DOOR_INFIL_SCH'))
+        infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantSitDown 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.614474994
-          infiltration_diningdoor.setSchedule(add_schedule('RestaurantSitDown DOOR_INFIL_SCH'))
+          infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantSitDown DOOR_INFIL_SCH'))
         else
           infiltration_per_zone_diningdoor = 0.389828222
-          infiltration_diningdoor.setSchedule(add_schedule('RestaurantSitDown VESTIBULE_DOOR_INFIL_SCH'))
+          infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantSitDown 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.614474994
-          infiltration_diningdoor.setSchedule(add_schedule('RestaurantSitDown DOOR_INFIL_SCH'))
+          infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantSitDown DOOR_INFIL_SCH'))
         else
           infiltration_per_zone_diningdoor = 0.389828222
-          infiltration_diningdoor.setSchedule(add_schedule('RestaurantSitDown VESTIBULE_DOOR_INFIL_SCH'))
+          infiltration_diningdoor.setSchedule(model.add_schedule('RestaurantSitDown 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
 
-  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)
@@ -522,21 +523,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('RestaurantSitDown Hours_of_operation'))
+    zone_mixing_kitchen.setSchedule(model.add_schedule('RestaurantSitDown Hours_of_operation'))
     case template
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
       zone_mixing_kitchen.setDesignFlowRate(1.828)
@@ -550,12 +551,12 @@ class OpenStudio::Model::Model
   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
@@ -580,8 +581,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('RestaurantSitDown ALWAYS_ON'))
-      elec_equip2.setSchedule(add_schedule('RestaurantSitDown ALWAYS_ON'))
+      elec_equip1.setSchedule(model.add_schedule('RestaurantSitDown ALWAYS_ON'))
+      elec_equip2.setSchedule(model.add_schedule('RestaurantSitDown ALWAYS_ON'))
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
       elec_equip_def1.setDesignLevel(699)
       elec_equip_def1.setFractionLatent(0)
@@ -591,42 +592,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('RestaurantSitDown Kitchen_Exhaust_SCH'))
+      elec_equip1.setSchedule(model.add_schedule('RestaurantSitDown 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('RestaurantSitDown CLGSETP_SCH_NO_OPTIMUM'))
+            thermostat.setCoolingSetpointTemperatureSchedule(model.add_schedule('RestaurantSitDown CLGSETP_SCH_NO_OPTIMUM'))
           when 'Kitchen'
-            thermostat.setCoolingSetpointTemperatureSchedule(add_schedule('RestaurantSitDown CLGSETP_KITCHEN_SCH_NO_OPTIMUM'))
+            thermostat.setCoolingSetpointTemperatureSchedule(model.add_schedule('RestaurantSitDown CLGSETP_KITCHEN_SCH_NO_OPTIMUM'))
           end
         end
       end
@@ -636,8 +637,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)
@@ -651,10 +652,10 @@ class OpenStudio::Model::Model
     end
   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|
         if water_heater.name.to_s.include?('Booster')
           water_heater.setOffCycleLossCoefficienttoAmbientTemperature(1.053159296)
           water_heater.setOnCycleLossCoefficienttoAmbientTemperature(1.053159296)
@@ -666,9 +667,10 @@ class OpenStudio::Model::Model
     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::FullServiceRestaurant.update_waterheater_loss_coefficient(template, model)
 
     return true
   end
 end
+end

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

@@ -1,7 +1,8 @@
 
-
-class OpenStudio::Model::Model
-  def define_space_type_map(building_type, template, climate_zone)
+# Modules for building-type specific methods
+module PrototypeBuilding
+module HighriseApartment
+  def self.define_space_type_map(building_type, template, climate_zone)
     space_type_map = nil
     case template
 
@@ -187,7 +188,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',
         'space_names' => ['G SW Apartment'] },
@@ -354,20 +355,20 @@ 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)
     # add elevator and lights&fans for the ground floor corridor
-    add_extra_equip_corridor(template)
+    PrototypeBuilding::HighriseApartment.add_extra_equip_corridor(template, model)
     # add extra infiltration for ground floor corridor
-    add_door_infiltration(template, climate_zone)
+    PrototypeBuilding::HighriseApartment.add_door_infiltration(template, climate_zone, model)
 
     return true
   end # add hvac
 
   # add elevator and lights&fans for the top floor corridor
-  def add_extra_equip_corridor(template)
-    corridor_top_space = getSpaceByName('T Corridor').get
-    elec_equip_def1 = OpenStudio::Model::ElectricEquipmentDefinition.new(self)
-    elec_equip_def2 = OpenStudio::Model::ElectricEquipmentDefinition.new(self)
+  def self.add_extra_equip_corridor(template, model)
+    corridor_top_space = model.getSpaceByName('T Corridor').get
+    elec_equip_def1 = OpenStudio::Model::ElectricEquipmentDefinition.new(model)
+    elec_equip_def2 = OpenStudio::Model::ElectricEquipmentDefinition.new(model)
     elec_equip_def1.setName('T Corridor Electric Equipment Definition1')
     elec_equip_def2.setName('T Corridor Electric Equipment Definition2')
     elec_equip_def1.setFractionLatent(0)
@@ -392,19 +393,19 @@ class OpenStudio::Model::Model
     elec_equip2.setName('Elevators_Lights_Fan')
     elec_equip1.setSpace(corridor_top_space)
     elec_equip2.setSpace(corridor_top_space)
-    elec_equip1.setSchedule(add_schedule('ApartmentMidRise BLDG_ELEVATORS'))
+    elec_equip1.setSchedule(model.add_schedule('ApartmentMidRise BLDG_ELEVATORS'))
     case template
     when '90.1-2004', '90.1-2007'
-      elec_equip2.setSchedule(add_schedule('ApartmentMidRise ELEV_LIGHT_FAN_SCH_24_7'))
+      elec_equip2.setSchedule(model.add_schedule('ApartmentMidRise ELEV_LIGHT_FAN_SCH_24_7'))
     when '90.1-2010', '90.1-2013'
-      elec_equip2.setSchedule(add_schedule('ApartmentMidRise ELEV_LIGHT_FAN_SCH_ADD_DF'))
+      elec_equip2.setSchedule(model.add_schedule('ApartmentMidRise ELEV_LIGHT_FAN_SCH_ADD_DF'))
     end
   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'
-      getWaterHeaterMixeds.sort.each do |water_heater|
+      model.getWaterHeaterMixeds.sort.each do |water_heater|
         water_heater.setOffCycleLossCoefficienttoAmbientTemperature(46.288874618)
         water_heater.setOnCycleLossCoefficienttoAmbientTemperature(46.288874618)
       end
@@ -412,37 +413,38 @@ class OpenStudio::Model::Model
   end
 
   # add extra infiltration for ground floor corridor
-  def add_door_infiltration(template, climate_zone)
-    g_corridor = getSpaceByName('G Corridor').get
-    infiltration_g_corridor_door = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(self)
+  def self.add_door_infiltration(template, climate_zone, model)
+    g_corridor = model.getSpaceByName('G Corridor').get
+    infiltration_g_corridor_door = OpenStudio::Model::SpaceInfiltrationDesignFlowRate.new(model)
     infiltration_g_corridor_door.setName('G Corridor door Infiltration')
     infiltration_g_corridor_door.setSpace(g_corridor)
     case template
     when '90.1-2004'
       infiltration_g_corridor_door.setDesignFlowRate(1.523916863)
-      infiltration_g_corridor_door.setSchedule(add_schedule('ApartmentHighRise INFIL_Door_Opening_SCH_0.144'))
+      infiltration_g_corridor_door.setSchedule(model.add_schedule('ApartmentHighRise INFIL_Door_Opening_SCH_0.144'))
     when '90.1-2007', '90.1-2010', '90.1-2013'
       case climate_zone
       when 'ASHRAE 169-2006-1A', 'ASHRAE 169-2006-2A', 'ASHRAE 169-2006-2B'
         infiltration_g_corridor_door.setDesignFlowRate(1.523916863)
-        infiltration_g_corridor_door.setSchedule(add_schedule('ApartmentHighRise INFIL_Door_Opening_SCH_0.144'))
+        infiltration_g_corridor_door.setSchedule(model.add_schedule('ApartmentHighRise INFIL_Door_Opening_SCH_0.144'))
       else
         infiltration_g_corridor_door.setDesignFlowRate(1.008078792)
-        infiltration_g_corridor_door.setSchedule(add_schedule('ApartmentHighRise INFIL_Door_Opening_SCH_0.131'))
+        infiltration_g_corridor_door.setSchedule(model.add_schedule('ApartmentHighRise INFIL_Door_Opening_SCH_0.131'))
       end
     end
   end
 
-  def update_fan_efficiency
-    getFanOnOffs.sort.each do |fan_onoff|
+  def self.update_fan_efficiency(model)
+    model.getFanOnOffs.sort.each do |fan_onoff|
       fan_onoff.setFanEfficiency(0.53625)
       fan_onoff.setMotorEfficiency(0.825)
     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::HighriseApartment.update_waterheater_loss_coefficient(template, model)
 
     return true
   end
 end
+end

data/lib/openstudio-standards/prototypes/Prototype.hospital.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 Hospital
+  def self.define_space_type_map(building_type, template, climate_zone)
     space_type_map = nil
     case template
     when 'NECB 2011'
@@ -61,7 +62,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 '90.1-2010', '90.1-2013'
       exhaust_flow = 7200
@@ -253,7 +254,7 @@ class OpenStudio::Model::Model
     end
   end
 
-  def define_space_multiplier
+  def self.define_space_multiplier
     space_multiplier_map = {
       'ER_Exam1_Mult4_Flr_1' => 4,
       'ER_Exam3_Mult4_Flr_1' => 4,
@@ -276,13 +277,13 @@ class OpenStudio::Model::Model
     return space_multiplier_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 Adding HVAC')
 
-    system_to_space_map = define_hvac_system_map(building_type, template, climate_zone)
+    system_to_space_map = PrototypeBuilding::Hospital.define_hvac_system_map(building_type, template, climate_zone)
 
     hot_water_loop = nil
-    getPlantLoops.each do |loop|
+    model.getPlantLoops.each do |loop|
       # If it has a boiler:hotwater, it is the correct loop
       unless loop.supplyComponents('OS:Boiler:HotWater'.to_IddObjectType).empty?
         hot_water_loop = loop
@@ -293,29 +294,29 @@ class OpenStudio::Model::Model
       when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
         space_names = ['ER_Exam3_Mult4_Flr_1', 'OR2_Mult5_Flr_2', 'ICU_Flr_2', 'PatRoom5_Mult10_Flr_4', 'Lab_Flr_3']
         space_names.each do |space_name|
-          add_humidifier(space_name, template, hot_water_loop)
+          PrototypeBuilding::Hospital.add_humidifier(space_name, template, hot_water_loop, model)
         end
       when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
         space_names = ['ER_Exam3_Mult4_Flr_1', 'OR2_Mult5_Flr_2']
         space_names.each do |space_name|
-          add_humidifier(space_name, template, hot_water_loop)
+          PrototypeBuilding::Hospital.add_humidifier(space_name, template, hot_water_loop, model)
         end
       end
     else
       OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Model', 'Could not find hot water loop to attach humidifier to.')
     end
 
-    reset_kitchen_oa(template)
-    update_exhaust_fan_efficiency(template)
-    reset_or_room_vav_minimum_damper(prototype_input, template)
+    PrototypeBuilding::Hospital.reset_kitchen_oa(template, model)
+    PrototypeBuilding::Hospital.update_exhaust_fan_efficiency(template, model)
+    PrototypeBuilding::Hospital.reset_or_room_vav_minimum_damper(prototype_input, template, 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'
-      getWaterHeaterMixeds.sort.each do |water_heater|
+      model.getWaterHeaterMixeds.sort.each do |water_heater|
         if water_heater.name.to_s.include?('Booster')
           water_heater.setOffCycleLossCoefficienttoAmbientTemperature(1.053159296)
           water_heater.setOnCycleLossCoefficienttoAmbientTemperature(1.053159296)
@@ -327,13 +328,13 @@ class OpenStudio::Model::Model
     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::Hospital.update_waterheater_loss_coefficient(template, model)
     return true
   end # add swh
 
-  def reset_kitchen_oa(template)
-    space_kitchen = getSpaceByName('Kitchen_Flr_5').get
+  def self.reset_kitchen_oa(template, model)
+    space_kitchen = model.getSpaceByName('Kitchen_Flr_5').get
     ventilation = space_kitchen.designSpecificationOutdoorAir.get
     ventilation.setOutdoorAirFlowperPerson(0)
     ventilation.setOutdoorAirFlowperFloorArea(0)
@@ -345,32 +346,32 @@ 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|
         exhaust_fan.setFanEfficiency(0.16)
         exhaust_fan.setPressureRise(125)
       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(0.338)
         exhaust_fan.setPressureRise(125)
       end
     end
   end
 
-  def add_humidifier(space_name, template, hot_water_loop)
-    space = getSpaceByName(space_name).get
+  def self.add_humidifier(space_name, template, hot_water_loop, model)
+    space = model.getSpaceByName(space_name).get
     zone = space.thermalZone.get
-    humidistat = OpenStudio::Model::ZoneControlHumidistat.new(self)
-    humidistat.setHumidifyingRelativeHumiditySetpointSchedule(add_schedule('Hospital MinRelHumSetSch'))
-    humidistat.setDehumidifyingRelativeHumiditySetpointSchedule(add_schedule('Hospital MaxRelHumSetSch'))
+    humidistat = OpenStudio::Model::ZoneControlHumidistat.new(model)
+    humidistat.setHumidifyingRelativeHumiditySetpointSchedule(model.add_schedule('Hospital MinRelHumSetSch'))
+    humidistat.setDehumidifyingRelativeHumiditySetpointSchedule(model.add_schedule('Hospital MaxRelHumSetSch'))
     zone.setZoneControlHumidistat(humidistat)
 
-    getAirLoopHVACs.each do |air_loop|
+    model.getAirLoopHVACs.each do |air_loop|
       if air_loop.thermalZones.include? zone
-        humidifier = OpenStudio::Model::HumidifierSteamElectric.new(self)
+        humidifier = OpenStudio::Model::HumidifierSteamElectric.new(model)
         humidifier.setRatedCapacity(3.72E-5)
         humidifier.setRatedPower(100_000)
         humidifier.setName("#{air_loop.name.get} Electric Steam Humidifier")
@@ -384,12 +385,12 @@ class OpenStudio::Model::Model
         heating_coil_outlet_node = htg_coil.airOutletModelObject.get.to_Node.get
         supply_outlet_node = air_loop.supplyOutletNode
         humidifier.addToNode(heating_coil_outlet_node)
-        humidity_spm = OpenStudio::Model::SetpointManagerSingleZoneHumidityMinimum.new(self)
+        humidity_spm = OpenStudio::Model::SetpointManagerSingleZoneHumidityMinimum.new(model)
         case template
         when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
-          extra_elec_htg_coil = OpenStudio::Model::CoilHeatingElectric.new(self, alwaysOnDiscreteSchedule)
+          extra_elec_htg_coil = OpenStudio::Model::CoilHeatingElectric.new(model, model.alwaysOnDiscreteSchedule)
           extra_elec_htg_coil.setName("#{space_name} Electric Htg Coil")
-          extra_water_htg_coil = OpenStudio::Model::CoilHeatingWater.new(self, alwaysOnDiscreteSchedule)
+          extra_water_htg_coil = OpenStudio::Model::CoilHeatingWater.new(model, model.alwaysOnDiscreteSchedule)
           extra_water_htg_coil.setName("#{space_name} Water Htg Coil")
           hot_water_loop.addDemandBranchForComponent(extra_water_htg_coil)
           extra_elec_htg_coil.addToNode(supply_outlet_node)
@@ -402,31 +403,31 @@ class OpenStudio::Model::Model
     end
   end
 
-  def hospital_add_daylighting_controls(template)
+  def self.hospital_add_daylighting_controls(template, model)
     space_names = ['Office1_Flr_5', 'Office3_Flr_5', 'Lobby_Records_Flr_1']
     space_names.each do |space_name|
-      space = getSpaceByName(space_name).get
+      space = model.getSpaceByName(space_name).get
       space.add_daylighting_controls(template, false, false)
     end
   end
 
-  def reset_or_room_vav_minimum_damper(prototype_input, template)
+  def self.reset_or_room_vav_minimum_damper(prototype_input, template, model)
     case template
     when '90.1-2004', '90.1-2007'
       return true
     when '90.1-2010', '90.1-2013'
-      getAirTerminalSingleDuctVAVReheats.sort.each do |airterminal|
+      model.getAirTerminalSingleDuctVAVReheats.sort.each do |airterminal|
         airterminal_name = airterminal.name.get
         if airterminal_name.include?('OR1') || airterminal_name.include?('OR2') || airterminal_name.include?('OR3') || airterminal_name.include?('OR4')
           airterminal.setZoneMinimumAirFlowMethod('Scheduled')
-          airterminal.setMinimumAirFlowFractionSchedule(add_schedule('Hospital OR_MinSA_Sched'))
+          airterminal.setMinimumAirFlowFractionSchedule(model.add_schedule('Hospital OR_MinSA_Sched'))
         end
       end
     end
   end
 
-  def modify_hospital_oa_controller(template)
-    getAirLoopHVACs.each do |air_loop|
+  def self.modify_hospital_oa_controller(template, model)
+    model.getAirLoopHVACs.each do |air_loop|
       oa_sys = air_loop.airLoopHVACOutdoorAirSystem.get
       oa_control = oa_sys.getControllerOutdoorAir
       case air_loop.name.get
@@ -436,3 +437,4 @@ class OpenStudio::Model::Model
     end
   end
 end
+end