Attempt to adress test failures.

NREL · Apr 30, 2024 · 298c5c5 · 298c5c5
1 parent 66f3918
commit 298c5c5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb b/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb
@@ -5980,7 +5980,6 @@ def model_add_residential_erv(model,
     supply_fan.setPressureRise(270.64755)
     exhaust_fan.setPressureRise(270.64755)
 
-
     # Create ERV Controller
     erv_controller = OpenStudio::Model::ZoneHVACEnergyRecoveryVentilatorController.new(model)
     erv_controller.setName("#{thermal_zone.name} ERV Controller")

diff --git a/lib/openstudio-standards/standards/Standards.CoilCoolingDXSingleSpeed.rb b/lib/openstudio-standards/standards/Standards.CoilCoolingDXSingleSpeed.rb
@@ -195,21 +195,24 @@ def coil_cooling_dx_single_speed_standard_minimum_cop(coil_cooling_dx_single_spe
   def coil_cooling_dx_single_speed_apply_efficiency_and_curves(coil_cooling_dx_single_speed, sql_db_vars_map, necb_ref_hp = false)
     successfully_set_all_properties = true
 
-    # Get the search criteria.
-    search_criteria = coil_dx_find_search_criteria(coil_cooling_dx_single_speed, necb_ref_hp)
-
-    # Get the capacity.
+    # Get the capacity
     capacity_w = coil_cooling_dx_single_speed_find_capacity(coil_cooling_dx_single_speed, necb_ref_hp)
     capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
     capacity_kbtu_per_hr = OpenStudio.convert(capacity_w, 'W', 'kBtu/hr').get
 
-    # Lookup efficiencies depending on whether it is a unitary AC or a heat pump
-    ac_props = nil
-    ac_props = if coil_dx_heat_pump?(coil_cooling_dx_single_speed)
-                 model_find_object(standards_data['heat_pumps'], search_criteria, capacity_btu_per_hr, Date.today)
-               else
-                 model_find_object(standards_data['unitary_acs'], search_criteria, capacity_btu_per_hr, Date.today)
-               end
+    # Get efficiencies data depending on whether it is a unitary AC or a heat pump
+    coil_efficiency_data = if coil_dx_heat_pump?(coil_cooling_dx_single_speed)
+                             standards_data['heat_pumps']
+                           else
+                             standards_data['unitary_acs']
+                           end
+
+    # Get the search criteria
+    equipment_type = coil_efficiency_data[0].keys.include?('equipment_type') ? true : false
+    search_criteria = coil_dx_find_search_criteria(coil_cooling_dx_single_speed, necb_ref_hp, equipment_type)
+
+    # Lookup efficiency
+    ac_props = model_find_object(coil_efficiency_data, search_criteria, capacity_btu_per_hr, Date.today)
 
     # Check to make sure properties were found
     if ac_props.nil?

diff --git a/lib/openstudio-standards/standards/Standards.CoilDX.rb b/lib/openstudio-standards/standards/Standards.CoilDX.rb
@@ -158,8 +158,9 @@ def coil_dx_heating_type(coil_dx, necb_ref_hp = false)
   # @param coil_dx [OpenStudio::Model::StraightComponent] coil cooling object, allowable types:
   #   CoilCoolingDXSingleSpeed, CoilCoolingDXTwoSpeed, CoilCoolingDXMultiSpeed
   # @param necb_ref_hp [Boolean] for compatability with NECB ruleset only.
+  # @param equipment_type [Boolean] indicate that equipment_type should be in the search criteria.
   # @return [Hash] has for search criteria to be used for find object
-  def coil_dx_find_search_criteria(coil_dx, necb_ref_hp = false)
+  def coil_dx_find_search_criteria(coil_dx, necb_ref_hp = false, equipment_type = false)
     search_criteria = {}
     search_criteria['template'] = template
 
@@ -200,14 +201,16 @@ def coil_dx_find_search_criteria(coil_dx, necb_ref_hp = false)
     end
 
     # Get the equipment type
-    if coil_dx.airLoopHVAC.empty?
-      if coil_dx.containingZoneHVACComponent.is_initialized
-        containing_comp = coil_dx.containingZoneHVACComponent.get
-        # PTAC
-        if containing_comp.to_ZoneHVACPackagedTerminalAirConditioner.is_initialized
-          search_criteria['equipment_type'] = 'PTAC'
-          search_criteria['subcategory'] = nil
-          search_criteria['heating_type'] = nil
+    if equipment_type
+      if coil_dx.airLoopHVAC.empty?
+        if coil_dx.containingZoneHVACComponent.is_initialized
+          containing_comp = coil_dx.containingZoneHVACComponent.get
+          # PTAC
+          if containing_comp.to_ZoneHVACPackagedTerminalAirConditioner.is_initialized
+            search_criteria['equipment_type'] = 'PTAC'
+            search_criteria['subcategory'] = nil
+            search_criteria['heating_type'] = nil
+          end
         end
       end
     end