openstudio-standards 0.1.4 → 0.1.5

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

@@ -1,78 +1,60 @@
 
 # Extend the class to add Large Hotel specific stuff
 class OpenStudio::Model::Model
-
-  def define_space_type_map(building_type, building_vintage, climate_zone)
+  def define_space_type_map(building_type, template, climate_zone)
     space_type_map = nil
-    case building_vintage
+    case template
     when 'NECB 2011'
-      space_type_map ={
-        "Hotel/Motel - dining" => ["Banquet_Flr_6", "Dining_Flr_6"],
-        "Storage area" => ["Basement", "Storage_Flr_1"],
-        "Retail - mall concourse" => ["Cafe_Flr_1"],
-        "Corr. >= 2.4m wide" => ["Corridor_Flr_3", "Corridor_Flr_6"],
-        "Food preparation" => ["Kitchen_Flr_6"],
-        "Hospital - laundry/washing" => ["Laundry_Flr_1"],
-        "Hotel/Motel - lobby" => ["Lobby_Flr_1"],
-        "Electrical/Mechanical" => ["Mech_Flr_1"],
-        "Retail - sales" => ["Retail_1_Flr_1", "Retail_2_Flr_1"],
-        "Hotel/Motel - rooms" => ["Room_1_Flr_3", "Room_1_Flr_6", "Room_2_Flr_3", "Room_2_Flr_6", "Room_3_Mult19_Flr_3", "Room_3_Mult9_Flr_6", "Room_4_Mult19_Flr_3", "Room_5_Flr_3", "Room_6_Flr_3"]
+      # Building Schedule
+      sch = 'E'
+      space_type_map = {
+        'Hotel/Motel - dining' => ['Banquet_Flr_6', 'Dining_Flr_6'],
+        'Storage area' => ['Basement', 'Storage_Flr_1'],
+        'Retail - mall concourse' => ['Cafe_Flr_1'],
+        "Corr. >= 2.4m wide-sch-#{sch}" => ['Corridor_Flr_3', 'Corridor_Flr_6'],
+        'Food preparation' => ['Kitchen_Flr_6'],
+        'Hospital - laundry/washing' => ['Laundry_Flr_1'],
+        'Hotel/Motel - lobby' => ['Lobby_Flr_1'],
+        "Electrical/Mechanical-sch-#{sch}" => ['Mech_Flr_1'],
+        'Retail - sales' => ['Retail_1_Flr_1', 'Retail_2_Flr_1'],
+        'Hotel/Motel - rooms' => ['Room_1_Flr_3', 'Room_1_Flr_6', 'Room_2_Flr_3', 'Room_2_Flr_6', 'Room_3_Mult19_Flr_3', 'Room_3_Mult9_Flr_6', 'Room_4_Mult19_Flr_3', 'Room_5_Flr_3', 'Room_6_Flr_3']
       }
     else
       space_type_map = {
-        'Banquet' => ['Banquet_Flr_6','Dining_Flr_6'],
-        'Basement'=>['Basement'],
+        'Banquet' => ['Banquet_Flr_6', 'Dining_Flr_6'],
+        'Basement' => ['Basement'],
         'Cafe' => ['Cafe_Flr_1'],
-        'Corridor'=> ['Corridor_Flr_6'],
-        'Corridor2'=> ['Corridor_Flr_3'],
-        'GuestRoom'=> ['Room_1_Flr_3','Room_2_Flr_3','Room_5_Flr_3','Room_6_Flr_3'],
-        'GuestRoom2'=> ['Room_3_Mult19_Flr_3','Room_4_Mult19_Flr_3'],
-        'GuestRoom3'=> ['Room_1_Flr_6','Room_2_Flr_6'],
-        'GuestRoom4'=> ['Room_3_Mult9_Flr_6'],
-        'Kitchen'=> ['Kitchen_Flr_6'],
-        'Laundry'=> ['Laundry_Flr_1'],
-        'Lobby'=> ['Lobby_Flr_1'],
-        'Mechanical'=> ['Mech_Flr_1'],
-        'Retail'=> ['Retail_1_Flr_1'],
-        'Retail2'=> ['Retail_2_Flr_1'],
-        'Storage'=> ['Storage_Flr_1']
+        'Corridor' => ['Corridor_Flr_6'],
+        'Corridor2' => ['Corridor_Flr_3'],
+        'GuestRoom' => ['Room_1_Flr_3', 'Room_2_Flr_3', 'Room_5_Flr_3', 'Room_6_Flr_3'],
+        'GuestRoom2' => ['Room_3_Mult19_Flr_3', 'Room_4_Mult19_Flr_3'],
+        'GuestRoom3' => ['Room_1_Flr_6', 'Room_2_Flr_6'],
+        'GuestRoom4' => ['Room_3_Mult9_Flr_6'],
+        'Kitchen' => ['Kitchen_Flr_6'],
+        'Laundry' => ['Laundry_Flr_1'],
+        'Lobby' => ['Lobby_Flr_1'],
+        'Mechanical' => ['Mech_Flr_1'],
+        'Retail' => ['Retail_1_Flr_1'],
+        'Retail2' => ['Retail_2_Flr_1'],
+        'Storage' => ['Storage_Flr_1']
       }
     end
-    
-    
-
 
     return space_type_map
   end
 
-  def define_hvac_system_map(building_type, building_vintage, climate_zone)
+  def define_hvac_system_map(building_type, template, climate_zone)
     system_to_space_map = [
       {
         'type' => 'VAV',
         'name' => 'VAV WITH REHEAT',
         'space_names' =>
-          [
-          'Basement',
-          'Retail_1_Flr_1',
-          'Retail_2_Flr_1',
-          'Mech_Flr_1',
-          'Storage_Flr_1',
-          'Laundry_Flr_1',
-          'Cafe_Flr_1',
-          'Lobby_Flr_1',
-          'Corridor_Flr_3',
-          'Banquet_Flr_6',
-          'Dining_Flr_6',
-          'Corridor_Flr_6',
-          'Kitchen_Flr_6'
-        ]
+          ['Basement', 'Retail_1_Flr_1', 'Retail_2_Flr_1', 'Mech_Flr_1', 'Storage_Flr_1', 'Laundry_Flr_1', 'Cafe_Flr_1', 'Lobby_Flr_1', 'Corridor_Flr_3', 'Banquet_Flr_6', 'Dining_Flr_6', 'Corridor_Flr_6', 'Kitchen_Flr_6']
       },
       {
         'type' => 'DOAS',
         'space_names' =>
-          [
-          'Room_1_Flr_3','Room_2_Flr_3','Room_3_Mult19_Flr_3','Room_4_Mult19_Flr_3','Room_5_Flr_3','Room_6_Flr_3','Room_1_Flr_6','Room_2_Flr_6','Room_3_Mult9_Flr_6'
-        ]
+          ['Room_1_Flr_3', 'Room_2_Flr_3', 'Room_3_Mult19_Flr_3', 'Room_4_Mult19_Flr_3', 'Room_5_Flr_3', 'Room_6_Flr_3', 'Room_1_Flr_6', 'Room_2_Flr_6', 'Room_3_Mult9_Flr_6']
       },
       {
         'type' => 'Refrigeration',
@@ -90,8 +72,8 @@ class OpenStudio::Model::Model
         'condenser_fan_pwr_curve_name' => 'RACK1_RackCondFanCurve2',
         'space_names' =>
           [
-          'Kitchen_Flr_6'
-        ]
+            'Kitchen_Flr_6'
+          ]
       },
       {
         'type' => 'Refrigeration',
@@ -109,8 +91,8 @@ class OpenStudio::Model::Model
         'condenser_fan_pwr_curve_name' => 'RACK1_RackCondFanCurve2',
         'space_names' =>
           [
-          'Kitchen_Flr_6'
-        ]
+            'Kitchen_Flr_6'
+          ]
       }
     ]
     return system_to_space_map
@@ -131,30 +113,29 @@ class OpenStudio::Model::Model
     return space_multiplier_map
   end
 
-  def custom_hvac_tweaks(building_type, building_vintage, climate_zone, prototype_input)
-    
-    OpenStudio::logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')    
-    
+  def custom_hvac_tweaks(building_type, template, climate_zone, prototype_input)
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started building type specific adjustments')
+
     # Add Exhaust Fan
-    space_type_map = define_space_type_map(building_type, building_vintage, climate_zone)
+    space_type_map = define_space_type_map(building_type, template, climate_zone)
     exhaust_fan_space_types = []
-    case building_vintage
-    when '90.1-2004','90.1-2007'
-      exhaust_fan_space_types =['Kitchen','Laundry']
+    case template
+    when '90.1-2004', '90.1-2007'
+      exhaust_fan_space_types = ['Kitchen', 'Laundry']
     else
-      exhaust_fan_space_types =['Banquet', 'Kitchen','Laundry']
+      exhaust_fan_space_types = ['Banquet', 'Kitchen', 'Laundry']
     end
 
     exhaust_fan_space_types.each do |space_type_name|
-      space_type_data = self.find_object($os_standards['space_types'], {'template'=>building_vintage, 'building_type'=>building_type, 'space_type'=>space_type_name})
-      if space_type_data == nil
-        OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', "Unable to find space type #{building_vintage}-#{building_type}-#{space_type_name}")
+      space_type_data = find_object($os_standards['space_types'], 'template' => template, 'building_type' => building_type, 'space_type' => space_type_name)
+      if space_type_data.nil?
+        OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "Unable to find space type #{template}-#{building_type}-#{space_type_name}")
         return false
       end
 
       exhaust_schedule = add_schedule(space_type_data['exhaust_schedule'])
-      if exhaust_schedule.class.to_s == "NilClass"
-        OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', "Unable to find Exhaust Schedule for space type #{building_vintage}-#{building_type}-#{space_type_name}")
+      if exhaust_schedule.class.to_s == 'NilClass'
+        OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "Unable to find Exhaust Schedule for space type #{template}-#{building_type}-#{space_type_name}")
         return false
       end
 
@@ -162,24 +143,24 @@ class OpenStudio::Model::Model
 
       space_names = space_type_map[space_type_name]
       space_names.each do |space_name|
-        space = self.getSpaceByName(space_name).get
+        space = getSpaceByName(space_name).get
         thermal_zone = space.thermalZone.get
 
         zone_exhaust_fan = OpenStudio::Model::FanZoneExhaust.new(self)
-        zone_exhaust_fan.setName(space.name.to_s + " Exhaust Fan")
+        zone_exhaust_fan.setName(space.name.to_s + ' Exhaust Fan')
         zone_exhaust_fan.setAvailabilitySchedule(exhaust_schedule)
         zone_exhaust_fan.setFanEfficiency(space_type_data['exhaust_fan_efficiency'])
         zone_exhaust_fan.setPressureRise(space_type_data['exhaust_fan_pressure_rise'])
         maximum_flow_rate = OpenStudio.convert(space_type_data['exhaust_fan_maximum_flow_rate'], 'cfm', 'm^3/s').get
 
         zone_exhaust_fan.setMaximumFlowRate(maximum_flow_rate)
-        if balanced_exhaust_schedule.class.to_s != "NilClass"
+        if balanced_exhaust_schedule.class.to_s != 'NilClass'
           zone_exhaust_fan.setBalancedExhaustFractionSchedule(balanced_exhaust_schedule)
         end
-        zone_exhaust_fan.setEndUseSubcategory("Zone Exhaust Fans")
+        zone_exhaust_fan.setEndUseSubcategory('Zone Exhaust Fans')
         zone_exhaust_fan.addToThermalZone(thermal_zone)
 
-        if space_type_data['exhaust_fan_power'] != nil and space_type_data['exhaust_fan_power'].to_f != 0
+        if !space_type_data['exhaust_fan_power'].nil? && space_type_data['exhaust_fan_power'].to_f.nonzero?
           # Create the electric equipment definition
           exhaust_fan_equip_def = OpenStudio::Model::ElectricEquipmentDefinition.new(self)
           exhaust_fan_equip_def.setName("#{space_name} Electric Equipment Definition")
@@ -198,31 +179,27 @@ class OpenStudio::Model::Model
     end
 
     # Update Sizing Zone
-    zone_sizing = self.getSpaceByName('Kitchen_Flr_6').get.thermalZone.get.sizingZone
+    zone_sizing = getSpaceByName('Kitchen_Flr_6').get.thermalZone.get.sizingZone
     zone_sizing.setCoolingMinimumAirFlowFraction(0.7)
 
-    zone_sizing = self.getSpaceByName('Laundry_Flr_1').get.thermalZone.get.sizingZone
+    zone_sizing = getSpaceByName('Laundry_Flr_1').get.thermalZone.get.sizingZone
     zone_sizing.setCoolingMinimumAirFlow(0.23567919336)
 
-    OpenStudio::logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
-    
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
+
     return true
-    
-  end #add hvac
+  end # add hvac
 
   # Add the daylighting controls for lobby, cafe, dinning and banquet
-  def add_daylighting_controls(building_vintage)
-    space_names = ['Banquet_Flr_6','Dining_Flr_6','Cafe_Flr_1','Lobby_Flr_1']
+  def large_hotel_add_daylighting_controls(template)
+    space_names = ['Banquet_Flr_6', 'Dining_Flr_6', 'Cafe_Flr_1', 'Lobby_Flr_1']
     space_names.each do |space_name|
-      space = self.getSpaceByName(space_name).get
-      space.addDaylightingControls(building_vintage, false, false)
+      space = getSpaceByName(space_name).get
+      space.add_daylighting_controls(template, false, false)
     end
   end
 
-  def custom_swh_tweaks(building_type, building_vintage, climate_zone, prototype_input)
-
+  def custom_swh_tweaks(building_type, template, climate_zone, prototype_input)
     return true
-    
   end
-
 end

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

@@ -1,195 +1,148 @@
 # Extend the class to add Medium Office specific stuff
 class OpenStudio::Model::Model
-
-  def define_space_type_map(building_type, building_vintage, climate_zone)
-    case building_vintage
+  def define_space_type_map(building_type, template, climate_zone)
+    case template
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
       space_type_map = {
-      'WholeBuilding - Lg Office' => [
-        'Basement', 'Core_bottom', 'Core_mid', 'Core_top', #'GroundFloor_Plenum', 'MidFloor_Plenum', 'TopFloor_Plenum',
-        'Perimeter_bot_ZN_1', 'Perimeter_bot_ZN_2', 'Perimeter_bot_ZN_3', 'Perimeter_bot_ZN_4',
-        'Perimeter_mid_ZN_1', 'Perimeter_mid_ZN_2', 'Perimeter_mid_ZN_3', 'Perimeter_mid_ZN_4',
-        'Perimeter_top_ZN_1', 'Perimeter_top_ZN_2', 'Perimeter_top_ZN_3', 'Perimeter_top_ZN_4'
-      ]
-    }
-    when '90.1-2004','90.1-2007','90.1-2010','90.1-2013'
+        'WholeBuilding - Lg Office' => [
+          'Basement', 'Core_bottom', 'Core_mid', 'Core_top', # 'GroundFloor_Plenum', 'MidFloor_Plenum', 'TopFloor_Plenum',
+          'Perimeter_bot_ZN_1', 'Perimeter_bot_ZN_2', 'Perimeter_bot_ZN_3', 'Perimeter_bot_ZN_4',
+          'Perimeter_mid_ZN_1', 'Perimeter_mid_ZN_2', 'Perimeter_mid_ZN_3', 'Perimeter_mid_ZN_4',
+          'Perimeter_top_ZN_1', 'Perimeter_top_ZN_2', 'Perimeter_top_ZN_3', 'Perimeter_top_ZN_4'
+        ]
+      }
+    when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013'
       space_type_map = {
-      'WholeBuilding - Lg Office' => [
-        'Basement', 'Core_bottom', 'Core_mid', 'Core_top', #'GroundFloor_Plenum', 'MidFloor_Plenum', 'TopFloor_Plenum',
-        'Perimeter_bot_ZN_1', 'Perimeter_bot_ZN_2', 'Perimeter_bot_ZN_3', 'Perimeter_bot_ZN_4',
-        'Perimeter_mid_ZN_1', 'Perimeter_mid_ZN_2', 'Perimeter_mid_ZN_3', 'Perimeter_mid_ZN_4',
-        'Perimeter_top_ZN_1', 'Perimeter_top_ZN_2', 'Perimeter_top_ZN_3', 'Perimeter_top_ZN_4'
-      ],
-      'OfficeLarge Data Center' => [
-        'DataCenter_bot_ZN_6', 'DataCenter_mid_ZN_6', 'DataCenter_top_ZN_6'
-      ],
-      'OfficeLarge Main Data Center' => [
-        'DataCenter_basement_ZN_6'
-      ]
-    }
-      when 'NECB 2011'
+        'WholeBuilding - Lg Office' => [
+          'Basement', 'Core_bottom', 'Core_mid', 'Core_top', # 'GroundFloor_Plenum', 'MidFloor_Plenum', 'TopFloor_Plenum',
+          'Perimeter_bot_ZN_1', 'Perimeter_bot_ZN_2', 'Perimeter_bot_ZN_3', 'Perimeter_bot_ZN_4',
+          'Perimeter_mid_ZN_1', 'Perimeter_mid_ZN_2', 'Perimeter_mid_ZN_3', 'Perimeter_mid_ZN_4',
+          'Perimeter_top_ZN_1', 'Perimeter_top_ZN_2', 'Perimeter_top_ZN_3', 'Perimeter_top_ZN_4'
+        ],
+        'OfficeLarge Data Center' => ['DataCenter_bot_ZN_6', 'DataCenter_mid_ZN_6', 'DataCenter_top_ZN_6'],
+        'OfficeLarge Main Data Center' => [
+          'DataCenter_basement_ZN_6'
+        ]
+      }
+    when 'NECB 2011'
+      # Dom is A
       space_type_map = {
-        "Electrical/Mechanical" => ["Basement"],
+        'Electrical/Mechanical' => ['Basement'],
 
-        "Office - open plan" => [ "Core_bottom", "Core_mid", "Core_top", "MidFloor_Plenum",
-          "Perimeter_bot_ZN_1", "Perimeter_bot_ZN_2", "Perimeter_bot_ZN_3",
-          "Perimeter_bot_ZN_4", "Perimeter_mid_ZN_1", "Perimeter_mid_ZN_2",
-          "Perimeter_mid_ZN_3", "Perimeter_mid_ZN_4", "Perimeter_top_ZN_1",
-          "Perimeter_top_ZN_2", "Perimeter_top_ZN_3", "Perimeter_top_ZN_4",
-          "DataCenter_basement_ZN_6", "DataCenter_bot_ZN_6", "DataCenter_mid_ZN_6",
-          "DataCenter_top_ZN_6"],
-
-        "- undefined -" => ["GroundFloor_Plenum", "TopFloor_Plenum"]
+        'Office - open plan' => ['Core_bottom', 'Core_mid', 'Core_top', 'Perimeter_bot_ZN_1', 'Perimeter_bot_ZN_2', 'Perimeter_bot_ZN_3', 'Perimeter_bot_ZN_4', 'Perimeter_mid_ZN_1', 'Perimeter_mid_ZN_2', 'Perimeter_mid_ZN_3', 'Perimeter_mid_ZN_4', 'Perimeter_top_ZN_1', 'Perimeter_top_ZN_2', 'Perimeter_top_ZN_3', 'Perimeter_top_ZN_4', 'DataCenter_basement_ZN_6', 'DataCenter_bot_ZN_6', 'DataCenter_mid_ZN_6', 'DataCenter_top_ZN_6'],
+        '- undefined -' => ['GroundFloor_Plenum', 'TopFloor_Plenum', 'MidFloor_Plenum']
       }
     end
     return space_type_map
   end
 
-  def define_hvac_system_map(building_type, building_vintage, climate_zone)
-
-    case building_vintage
+  def define_hvac_system_map(building_type, template, climate_zone)
+    case template
     when 'DOE Ref Pre-1980', 'DOE Ref 1980-2004'
       system_to_space_map = [
         {
-            'type' => 'VAV',
-            'name' => 'VAV_1',
-            'space_names' =>
-            [
-                'Perimeter_bot_ZN_1',
-                'Perimeter_bot_ZN_2',
-                'Perimeter_bot_ZN_3',
-                'Perimeter_bot_ZN_4',
-                'Core_bottom'
-            ],
-            'return_plenum' => 'GroundFloor_Plenum'
+          'type' => 'VAV',
+          'name' => 'VAV_1',
+          'space_names' =>
+            ['Perimeter_bot_ZN_1', 'Perimeter_bot_ZN_2', 'Perimeter_bot_ZN_3', 'Perimeter_bot_ZN_4', 'Core_bottom'],
+          'return_plenum' => 'GroundFloor_Plenum'
         },
         {
-            'type' => 'VAV',
-            'name' => 'VAV_2',
-            'space_names' =>
-            [
-                'Perimeter_mid_ZN_1',
-                'Perimeter_mid_ZN_2',
-                'Perimeter_mid_ZN_3',
-                'Perimeter_mid_ZN_4',
-                'Core_mid'
-            ],
-            'return_plenum' => 'MidFloor_Plenum'
+          'type' => 'VAV',
+          'name' => 'VAV_2',
+          'space_names' =>
+            ['Perimeter_mid_ZN_1', 'Perimeter_mid_ZN_2', 'Perimeter_mid_ZN_3', 'Perimeter_mid_ZN_4', 'Core_mid'],
+          'return_plenum' => 'MidFloor_Plenum'
         },
         {
-            'type' => 'VAV',
-            'name' => 'VAV_3',
-            'space_names' =>
-            [
-                'Perimeter_top_ZN_1',
-                'Perimeter_top_ZN_2',
-                'Perimeter_top_ZN_3',
-                'Perimeter_top_ZN_4',
-                'Core_top'
-            ],
-            'return_plenum' => 'TopFloor_Plenum'
+          'type' => 'VAV',
+          'name' => 'VAV_3',
+          'space_names' =>
+            ['Perimeter_top_ZN_1', 'Perimeter_top_ZN_2', 'Perimeter_top_ZN_3', 'Perimeter_top_ZN_4', 'Core_top'],
+          'return_plenum' => 'TopFloor_Plenum'
         },
         {
-            'type' => 'VAV',
-            'name' => 'VAV_5',
-            'space_names' =>
+          'type' => 'VAV',
+          'name' => 'VAV_5',
+          'space_names' =>
             [
-                'Basement'
+              'Basement'
             ]
         }
       ]
-    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'
       system_to_space_map = [
         {
           'type' => 'VAV',
           'name' => 'VAV_bot WITH REHEAT',
           'space_names' =>
-          [
-              'Perimeter_bot_ZN_1',
-              'Perimeter_bot_ZN_2',
-              'Perimeter_bot_ZN_3',
-              'Perimeter_bot_ZN_4',
-              'Core_bottom'
-          ],
+          ['Perimeter_bot_ZN_1', 'Perimeter_bot_ZN_2', 'Perimeter_bot_ZN_3', 'Perimeter_bot_ZN_4', 'Core_bottom'],
           'return_plenum' => 'GroundFloor_Plenum'
-      },
-      {
+        },
+        {
           'type' => 'VAV',
           'name' => 'VAV_mid WITH REHEAT',
           'space_names' =>
-          [
-              'Perimeter_mid_ZN_1',
-              'Perimeter_mid_ZN_2',
-              'Perimeter_mid_ZN_3',
-              'Perimeter_mid_ZN_4',
-              'Core_mid'
-          ],
+            ['Perimeter_mid_ZN_1', 'Perimeter_mid_ZN_2', 'Perimeter_mid_ZN_3', 'Perimeter_mid_ZN_4', 'Core_mid'],
           'return_plenum' => 'MidFloor_Plenum'
-      },
-      {
+        },
+        {
           'type' => 'VAV',
           'name' => 'VAV_top WITH REHEAT',
           'space_names' =>
-          [
-              'Perimeter_top_ZN_1',
-              'Perimeter_top_ZN_2',
-              'Perimeter_top_ZN_3',
-              'Perimeter_top_ZN_4',
-              'Core_top'
-          ],
+            ['Perimeter_top_ZN_1', 'Perimeter_top_ZN_2', 'Perimeter_top_ZN_3', 'Perimeter_top_ZN_4', 'Core_top'],
           'return_plenum' => 'TopFloor_Plenum'
-      },
-      {
+        },
+        {
 
           'type' => 'CAV',
           'name' => 'CAV_bas',
           'space_names' =>
-            [
-            'Basement'
-          ]
-      },
-      {
+              [
+                'Basement'
+              ]
+        },
+        {
           'type' => 'DC',
           'space_names' =>
-          [
+            [
               'DataCenter_basement_ZN_6'
-          ],
+            ],
           'load' => 484.423246742185,
           'main_data_center' => true
-      },
-      {
+        },
+        {
           'type' => 'DC',
           'space_names' =>
-          [
+            [
               'DataCenter_bot_ZN_6'
-          ],
+            ],
           'load' => 215.299220774304,
           'main_data_center' => false
-      },
-      {
+        },
+        {
           'type' => 'DC',
           'space_names' =>
-          [
+            [
               'DataCenter_mid_ZN_6'
-          ],
+            ],
           'load' => 215.299220774304,
           'main_data_center' => false
-      },
-      {
+        },
+        {
           'type' => 'DC',
           'space_names' =>
-          [
+            [
               'DataCenter_top_ZN_6'
-          ],
+            ],
           'load' => 215.299220774304,
           'main_data_center' => false
-      }
-    ]
+        }
+      ]
 
     end
 
     return system_to_space_map
-
   end
 
   def define_space_multiplier
@@ -206,67 +159,59 @@ class OpenStudio::Model::Model
     return space_multiplier_map
   end
 
-  def custom_hvac_tweaks(building_type, building_vintage, climate_zone, prototype_input)
-
-
-    system_to_space_map = define_hvac_system_map(building_type, building_vintage, climate_zone)
+  def custom_hvac_tweaks(building_type, template, climate_zone, prototype_input)
+    system_to_space_map = define_hvac_system_map(building_type, template, climate_zone)
 
     system_to_space_map.each do |system|
-
-      #find all zones associated with these spaces
+      # find all zones associated with these spaces
       thermal_zones = []
       system['space_names'].each do |space_name|
-      space = self.getSpaceByName(space_name)
-      if space.empty?
-        OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', "No space called #{space_name} was found in the model")
-        return false
-      end
-      space = space.get
-      zone = space.thermalZone
-      if zone.empty?
-        OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', "No thermal zone was created for the space called #{space_name}")
-        return false
+        space = getSpaceByName(space_name)
+        if space.empty?
+          OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "No space called #{space_name} was found in the model")
+          return false
+        end
+        space = space.get
+        zone = space.thermalZone
+        if zone.empty?
+          OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "No thermal zone was created for the space called #{space_name}")
+          return false
+        end
+        thermal_zones << zone.get
       end
-      thermal_zones << zone.get
-    end
 
       return_plenum = nil
       unless system['return_plenum'].nil?
-        return_plenum_space = self.getSpaceByName(system['return_plenum'])
+        return_plenum_space = getSpaceByName(system['return_plenum'])
         if return_plenum_space.empty?
-          OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', "No space called #{system['return_plenum']} was found in the model")
+          OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "No space called #{system['return_plenum']} was found in the model")
           return false
         end
         return_plenum_space = return_plenum_space.get
         return_plenum = return_plenum_space.thermalZone
         if return_plenum.empty?
-          OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', "No thermal zone was created for the space called #{system['return_plenum']}")
+          OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "No thermal zone was created for the space called #{system['return_plenum']}")
           return false
         end
         return_plenum = return_plenum.get
       end
-
     end
 
     return true
-
   end
 
-  def update_waterheater_loss_coefficient(building_vintage)
-    case building_vintage
+  def update_waterheater_loss_coefficient(template)
+    case template
     when '90.1-2004', '90.1-2007', '90.1-2010', '90.1-2013', 'NECB 2011'
-      self.getWaterHeaterMixeds.sort.each do |water_heater|
+      getWaterHeaterMixeds.sort.each do |water_heater|
         water_heater.setOffCycleLossCoefficienttoAmbientTemperature(11.25413987)
         water_heater.setOnCycleLossCoefficienttoAmbientTemperature(11.25413987)
       end
     end
   end
 
-  def custom_swh_tweaks(building_type, building_vintage, climate_zone, prototype_input)
-
-    self.update_waterheater_loss_coefficient(building_vintage)
+  def custom_swh_tweaks(building_type, template, climate_zone, prototype_input)
+    update_waterheater_loss_coefficient(template)
     return true
-
   end
-
 end