modifications to allow consistent naming of systems.

lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_3_and_8_single_speed.rb

@@ -88,7 +88,7 @@ def add_sys3and8_single_zone_packaged_rooftop_unit_with_baseboard_heating_single
     sys_name_pars['zone_htg'] = baseboard_type
     sys_name_pars['zone_clg'] = 'none'
     sys_name_pars['sys_rf'] = 'none'
-    assign_base_sys_name(air_loop,
+    assign_base_sys_name(air_loop: air_loop,
                          sys_abbr: 'sys_3',
                          sys_oa: 'mixed',
                          sys_name_pars: sys_name_pars)

lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_4.rb

@@ -167,7 +167,7 @@ def add_sys4_single_zone_make_up_air_unit_with_baseboard_heating(model:,
     sys_name_pars['zone_htg'] = baseboard_type
     sys_name_pars['zone_clg'] = 'none'
     sys_name_pars['sys_rf'] = 'none'
-    assign_base_sys_name(air_loop,
+    assign_base_sys_name(air_loop: air_loop,
                          sys_abbr: 'sys_4',
                          sys_oa: 'mixed',
                          sys_name_pars: sys_name_pars)

lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_6.rb

@@ -154,7 +154,7 @@ def add_sys6_multi_zone_built_up_system_with_baseboard_heating(model:,
         sys_name_pars['zone_htg'] = baseboard_type
         sys_name_pars['zone_clg'] = 'none'
         sys_name_pars['sys_rf'] = 'vv'
-        assign_base_sys_name(air_loop,
+        assign_base_sys_name(air_loop: air_loop,
                              sys_abbr: 'sys_6',
                              sys_oa: 'mixed',
                              sys_name_pars: sys_name_pars)

lib/openstudio-standards/standards/necb/ECMS/hvac_systems.rb

@@ -819,7 +819,10 @@ def add_air_system(model:,
     sys_name_pars['sys_rf'] = 'none'
     sys_name_pars['sys_rf'] = 'cv' if sys_ret_fan_type == 'constant_volume'
     sys_name_pars['sys_rf'] = 'vv' if sys_ret_fan_type == 'variable_volume'
-    assign_base_sys_name(airloop, sys_abbr: sys_abbr, sys_oa: sys_vent_type, sys_name_pars: sys_name_pars)
+    assign_base_sys_name( air_loop: airloop, 
+                          sys_abbr: sys_abbr, 
+                          sys_oa: sys_vent_type, 
+                          sys_name_pars: sys_name_pars)
     return airloop, clg_eqpt, htg_eqpt, return_fan
   end
 

lib/openstudio-standards/standards/necb/NECB2011/hvac_namer.rb

@@ -18,17 +18,19 @@ def get_chiller_type_from_water_coil(cooling_coil_water: nil)
                 end #chillers
 
                 case chiller_names[0]
-                # Check if name contains ["Scroll","Centrifugal","RotaryScrew","Reciprocating"]
+                # Check if name contains ["Scroll","Centrifugal","RotaryScrew","Reciprocating","WaterCooled"]
                 when /Scroll/
                     chiller_type = 'scrl'
                 when /Centrifugal/
                     chiller_type = 'cent'
-                when /RotaryScrew/
+                when /RotaryScrew/ , /Rotary Screw/
                     chiller_type = 'screw'
                 when /Reciprocating/
                     chiller_type = 'recip'
+                when /WaterCooled/
+                    chiller_type = 'water'
                 else
-                    raise("Chiller type not recognized")
+                    raise("Chiller type not recognized #{chiller_names[0]}")
                 end
             end
         end
@@ -71,8 +73,8 @@ def detect_air_system_type(air_loop: nil , sys_abbr: nil , old_system_name: nil)
         chiller_type = get_chiller_type_from_water_coil(cooling_coil_water: cooling_coil_water)
 
         # Zone Baseboard Heating.
-        zone_htg_b_elec = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Zone HVAC Baseboard Convective Electric') }
-        zone_htg_b_water = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Zone HVAC Baseboard Convective Water') }
+        zone_htg_b_elec = air_loop.thermalZones.first.respond_to?(:equipment) ? air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Zone HVAC Baseboard Convective Electric') } : false
+        zone_htg_b_water = air_loop.thermalZones.first.respond_to?(:equipment) ? air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Zone HVAC Baseboard Convective Water') } : false
 
         # Zone VAV with Reheat. 
         zone_vav_rh = air_loop.components.detect(proc {false}) { |equip| equip.to_AirTerminalSingleDuctVAVReheat.is_initialized()} ? air_loop.components.detect() { |equip| equip.to_AirTerminalSingleDuctVAVReheat.is_initialized()}.to_AirTerminalSingleDuctVAVReheat.get : false
@@ -81,28 +83,33 @@ def detect_air_system_type(air_loop: nil , sys_abbr: nil , old_system_name: nil)
         # Zone 2/4 Pipe Fan Coils.
         zone_tpfc = false
         zone_fpfc = false
-        if air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.to_ZoneHVACFourPipeFanCoil().is_initialized()}
-            case air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.to_ZoneHVACFourPipeFanCoil().is_initialized()}.to_ZoneHVACFourPipeFanCoil.get.coolingCoil.to_CoilCoolingWater.get.availabilitySchedule.nameString
-            when 'tpfc_clg_availability'
-                zone_tpfc = true
-            when OpenStudio::Model::Model.new.alwaysOnDiscreteSchedule.nameString
-                zone_fpfc = true
-            else
-                raise('unknown schedule type')
-            end
+        if air_loop.thermalZones.first.respond_to?(:equipment)
+            fan_coil = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.to_ZoneHVACFourPipeFanCoil().is_initialized() }
+            if fan_coil
+                case fan_coil.to_ZoneHVACFourPipeFanCoil.get.coolingCoil.to_CoilCoolingWater.get.availabilitySchedule.nameString
+                when 'tpfc_clg_availability'
+                    zone_tpfc = true
+                when OpenStudio::Model::Model.new.alwaysOnDiscreteSchedule.nameString
+                    zone_fpfc = true
+                else
+                    raise('unknown schedule type')
+                end
             cooling_coil_water = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.to_ZoneHVACFourPipeFanCoil().is_initialized()}.to_ZoneHVACFourPipeFanCoil.get.coolingCoil.to_CoilCoolingWater.get
 
             # If chiller was not detected, from MAU or RTU, then detect it from the fan coil. 
             chiller_type = get_chiller_type_from_water_coil(cooling_coil_water: cooling_coil_water) if not chiller_type
+            end
         end  
 
 
-        zone_htg_pthp = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Zone HVAC Packaged Terminal Heat Pump') }
-        zone_clg_ptac = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('PTAC') }
-        zone_clg_pthp = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Zone HVAC Packaged Terminal Heat Pump') }
-        zone_rh_elec = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Air Terminal Single Duct Constant Volume Reheat') and equip.to_AirTerminalSingleDuctConstantVolumeReheat.get.reheatCoil.nameString.include?('Coil Heating Electric') }
-        zone_rh_gas = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Air Terminal Single Duct Constant Volume Reheat') and equip.to_AirTerminalSingleDuctConstantVolumeReheat.get.reheatCoil.nameString.include?('Coil Heating Gas') }
-        zone_rh_hw = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Air Terminal Single Duct Constant Volume Reheat') and equip.to_AirTerminalSingleDuctConstantVolumeReheat.get.reheatCoil.nameString.include?('Coil Heating Water') }
+        if air_loop.thermalZones.first.respond_to?(:equipment)
+            zone_htg_pthp = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Zone HVAC Packaged Terminal Heat Pump') }
+            zone_clg_ptac = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('PTAC') }
+            zone_clg_pthp = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Zone HVAC Packaged Terminal Heat Pump') }
+            zone_rh_elec = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Air Terminal Single Duct Constant Volume Reheat') and equip.to_AirTerminalSingleDuctConstantVolumeReheat.get.reheatCoil.nameString.include?('Coil Heating Electric') }
+            zone_rh_gas = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Air Terminal Single Duct Constant Volume Reheat') and equip.to_AirTerminalSingleDuctConstantVolumeReheat.get.reheatCoil.nameString.include?('Coil Heating Gas') }
+            zone_rh_hw = air_loop.thermalZones.first.equipment.detect(proc {false}) { |equip| equip.nameString.include?('Air Terminal Single Duct Constant Volume Reheat') and equip.to_AirTerminalSingleDuctConstantVolumeReheat.get.reheatCoil.nameString.include?('Coil Heating Water') }
+        end
         return_fan = air_loop.components.detect(proc {false}) { |equip| equip.nameString.include?('Fan') }
         # Determine System Outdoor Air type.
         oa_controller = air_loop.components.detect(proc {false}) { |equip| equip.nameString.include?('ControllerOutdoorAir') }

lib/openstudio-standards/standards/necb/NECB2011/hvac_system_6.rb

@@ -429,7 +429,7 @@ def add_sys6_multi_zone_reference_hp_with_baseboard_heating(model:,
         sys_name_pars['zone_htg'] = baseboard_type
         sys_name_pars['zone_clg'] = 'none'
         sys_name_pars['sys_rf'] = 'cv'
-        assign_base_sys_name(air_loop,
+        assign_base_sys_name(air_loop: air_loop,
                              sys_abbr: 'sys_6',
                              sys_oa: 'mixed',
                              sys_name_pars: sys_name_pars)