Merge branch 'latest-os-hpxml' of https://github.com/NREL/OpenStudio-ERI

into latest-os-hpxml-mf_aext_infiltration # Conflicts: # rulesets/resources/301ruleset.rb
NREL · Feb 23, 2024 · 1eaff6a · 1eaff6a
2 parents 1db4f90 + f147dd6
commit 1eaff6a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/rulesets/resources/301ruleset.rb b/rulesets/resources/301ruleset.rb
@@ -272,6 +272,7 @@ def self.remove_surfaces_from_iad(orig_bldg)
   def self.set_summary_reference(orig_bldg, new_bldg)
     # Global variables
     @bldg_type = orig_bldg.building_construction.residential_facility_type
+    orig_bldg.building_construction.average_ceiling_height = 8.202
     @cfa = orig_bldg.building_construction.conditioned_floor_area
     @nbeds = orig_bldg.building_construction.number_of_bedrooms
     @ncfl = orig_bldg.building_construction.number_of_conditioned_floors
@@ -291,6 +292,7 @@ def self.set_summary_reference(orig_bldg, new_bldg)
   def self.set_summary_rated(orig_bldg, new_bldg)
     # Global variables
     @bldg_type = orig_bldg.building_construction.residential_facility_type
+    orig_bldg.building_construction.average_ceiling_height = 8.202
     @cfa = orig_bldg.building_construction.conditioned_floor_area
     @nbeds = orig_bldg.building_construction.number_of_bedrooms
     @ncfl = orig_bldg.building_construction.number_of_conditioned_floors
@@ -310,6 +312,7 @@ def self.set_summary_rated(orig_bldg, new_bldg)
   def self.set_summary_iad(orig_bldg, new_bldg)
     # Global variables
     @bldg_type = orig_bldg.building_construction.residential_facility_type
+    orig_bldg.building_construction.average_ceiling_height = 8.202
     @cfa = 2400.0
     @nbeds = 3
     @ncfl = 2.0
@@ -2477,7 +2480,8 @@ def self.calc_rated_home_infiltration_ach50(orig_bldg)
     end
 
     if not min_nach.nil?
-      min_sla = Airflow.get_infiltration_SLA_from_ACH(min_nach, infil_height, 8.202, @weather)
+      avg_ceiling_height = orig_bldg.building_construction.average_ceiling_height
+      min_sla = Airflow.get_infiltration_SLA_from_ACH(min_nach, infil_height, avg_ceiling_height, @weather)
       min_ach50 = Airflow.get_infiltration_ACH50_from_SLA(min_sla, 0.65, @cfa, infil_volume)
       if ach50 < min_ach50
         ach50 = min_ach50