Merge pull request #726 from NREL/pub002-2024

Pub 002-2024
NREL · Apr 13, 2024 · 5a96786 · 5a96786
2 parents ae5b973 + 79f718e
commit 5a96786
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 63 deletions.
diff --git a/tasks.rb b/tasks.rb
@@ -565,8 +565,8 @@ def set_hpxml_roofs(hpxml_file, hpxml_bldg)
 
 def set_hpxml_rim_joists(hpxml_file, hpxml_bldg)
   if ['RESNET_Tests/4.5_DSE/HVAC3a.xml'].include? hpxml_file
-    for i in 0..hpxml_bldg.rim_joists.size - 1
-      hpxml_bldg.rim_joists[i].interior_adjacent_to = HPXML::LocationBasementUnconditioned
+    hpxml_bldg.rim_joists.each do |rim_joist|
+      rim_joist.interior_adjacent_to = HPXML::LocationBasementUnconditioned
     end
   elsif hpxml_file.include?('EPA_Tests/SF')
     if ['EPA_Tests/SF_National_3.1/SFNHv31_CZ2_FL_elec_slab.xml',
@@ -822,8 +822,8 @@ def set_hpxml_foundation_walls(hpxml_file, hpxml_bldg)
       end
     end
   elsif ['RESNET_Tests/4.5_DSE/HVAC3a.xml'].include? hpxml_file
-    for i in 0..hpxml_bldg.foundation_walls.size - 1
-      hpxml_bldg.foundation_walls[i].interior_adjacent_to = HPXML::LocationBasementUnconditioned
+    hpxml_bldg.foundation_walls.each do |foundation_wall|
+      foundation_wall.interior_adjacent_to = HPXML::LocationBasementUnconditioned
     end
   elsif hpxml_file.include?('EPA_Tests')
     if hpxml_file.include?('EPA_Tests/SF')
@@ -1677,8 +1677,8 @@ def set_hpxml_hvac_distributions(hpxml_file, hpxml_bldg)
   elsif ['RESNET_Tests/4.5_DSE/HVAC3d.xml',
          'RESNET_Tests/4.5_DSE/HVAC3h.xml'].include? hpxml_file
     # Supply and return duct leakage = 125 cfm each
-    for i in 0..hpxml_bldg.hvac_distributions[0].duct_leakage_measurements.size - 1
-      hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[i].duct_leakage_value = 125
+    hpxml_bldg.hvac_distributions[0].duct_leakage_measurements.each do |duct_leakage_measurement|
+      duct_leakage_measurement.duct_leakage_value = 125
     end
   elsif hpxml_file.include?('EPA_Tests')
     tot_cfm25 = 4.0 * hpxml_bldg.building_construction.conditioned_floor_area / 100.0
@@ -1718,19 +1718,19 @@ def set_hpxml_hvac_distributions(hpxml_file, hpxml_bldg)
                                                duct_surface_area: 77)
   elsif ['RESNET_Tests/4.5_DSE/HVAC3b.xml'].include? hpxml_file
     # Change to Duct Location = 100% in basement
-    for i in 0..hpxml_bldg.hvac_distributions[0].ducts.size - 1
-      hpxml_bldg.hvac_distributions[0].ducts[i].duct_location = HPXML::LocationBasementUnconditioned
+    hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+      duct.duct_location = HPXML::LocationBasementUnconditioned
     end
   elsif ['RESNET_Tests/4.5_DSE/HVAC3f.xml'].include? hpxml_file
     # Change to Duct Location = 100% in attic
-    for i in 0..hpxml_bldg.hvac_distributions[0].ducts.size - 1
-      hpxml_bldg.hvac_distributions[0].ducts[i].duct_location = HPXML::LocationAtticVented
+    hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+      duct.duct_location = HPXML::LocationAtticVented
     end
   elsif ['RESNET_Tests/4.5_DSE/HVAC3c.xml',
          'RESNET_Tests/4.5_DSE/HVAC3g.xml'].include? hpxml_file
     # Change to Duct R-val = 6
-    for i in 0..hpxml_bldg.hvac_distributions[0].ducts.size - 1
-      hpxml_bldg.hvac_distributions[0].ducts[i].duct_insulation_r_value = 6
+    hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+      duct.duct_insulation_r_value = 6
     end
   elsif hpxml_file.include?('EPA_Tests')
     supply_area = 0.27 * hpxml_bldg.building_construction.conditioned_floor_area
@@ -1796,6 +1796,22 @@ def set_hpxml_hvac_distributions(hpxml_file, hpxml_bldg)
                                                  duct_surface_area: (return_area * non_attic_frac).round(2))
     end
   end
+  # For DSE tests, use effective R-values instead of nominal R-values to match the test specs.
+  if hpxml_file.include? '4.5_DSE'
+    hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+      next if duct.duct_insulation_r_value.nil?
+
+      if duct.duct_insulation_r_value == 0
+        duct.duct_insulation_r_value = nil
+        duct.duct_effective_r_value = 1.5
+      elsif duct.duct_insulation_r_value == 6
+        duct.duct_insulation_r_value = nil
+        duct.duct_effective_r_value = 7
+      else
+        fail 'Unexpected error.'
+      end
+    end
+  end
 
   # CFA served
   if hpxml_bldg.hvac_distributions.size == 1

diff --git a/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3a.xml b/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3a.xml
@@ -592,14 +592,14 @@
                 <Ducts>
                   <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
-                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>1.5</DuctEffectiveRValue>
                   <DuctLocation>conditioned space</DuctLocation>
                   <DuctSurfaceArea>308.0</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
                   <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
-                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>1.5</DuctEffectiveRValue>
                   <DuctLocation>conditioned space</DuctLocation>
                   <DuctSurfaceArea>77.0</DuctSurfaceArea>
                 </Ducts>

diff --git a/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3b.xml b/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3b.xml
@@ -592,14 +592,14 @@
                 <Ducts>
                   <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
-                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>1.5</DuctEffectiveRValue>
                   <DuctLocation>basement - unconditioned</DuctLocation>
                   <DuctSurfaceArea>308.0</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
                   <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
-                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>1.5</DuctEffectiveRValue>
                   <DuctLocation>basement - unconditioned</DuctLocation>
                   <DuctSurfaceArea>77.0</DuctSurfaceArea>
                 </Ducts>

diff --git a/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3c.xml b/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3c.xml
@@ -592,14 +592,14 @@
                 <Ducts>
                   <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
-                  <DuctInsulationRValue>6.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>7.0</DuctEffectiveRValue>
                   <DuctLocation>basement - unconditioned</DuctLocation>
                   <DuctSurfaceArea>308.0</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
                   <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
-                  <DuctInsulationRValue>6.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>7.0</DuctEffectiveRValue>
                   <DuctLocation>basement - unconditioned</DuctLocation>
                   <DuctSurfaceArea>77.0</DuctSurfaceArea>
                 </Ducts>

diff --git a/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3d.xml b/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3d.xml
@@ -592,14 +592,14 @@
                 <Ducts>
                   <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
-                  <DuctInsulationRValue>6.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>7.0</DuctEffectiveRValue>
                   <DuctLocation>basement - unconditioned</DuctLocation>
                   <DuctSurfaceArea>308.0</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
                   <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
-                  <DuctInsulationRValue>6.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>7.0</DuctEffectiveRValue>
                   <DuctLocation>basement - unconditioned</DuctLocation>
                   <DuctSurfaceArea>77.0</DuctSurfaceArea>
                 </Ducts>

diff --git a/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3e.xml b/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3e.xml
@@ -410,14 +410,14 @@
                 <Ducts>
                   <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
-                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>1.5</DuctEffectiveRValue>
                   <DuctLocation>conditioned space</DuctLocation>
                   <DuctSurfaceArea>308.0</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
                   <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
-                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>1.5</DuctEffectiveRValue>
                   <DuctLocation>conditioned space</DuctLocation>
                   <DuctSurfaceArea>77.0</DuctSurfaceArea>
                 </Ducts>

diff --git a/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3f.xml b/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3f.xml
@@ -410,14 +410,14 @@
                 <Ducts>
                   <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
-                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>1.5</DuctEffectiveRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>308.0</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
                   <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
-                  <DuctInsulationRValue>0.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>1.5</DuctEffectiveRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>77.0</DuctSurfaceArea>
                 </Ducts>

diff --git a/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3g.xml b/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3g.xml
@@ -410,14 +410,14 @@
                 <Ducts>
                   <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
-                  <DuctInsulationRValue>6.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>7.0</DuctEffectiveRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>308.0</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
                   <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
-                  <DuctInsulationRValue>6.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>7.0</DuctEffectiveRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>77.0</DuctSurfaceArea>
                 </Ducts>

diff --git a/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3h.xml b/workflow/tests/RESNET_Tests/4.5_DSE/HVAC3h.xml
@@ -410,14 +410,14 @@
                 <Ducts>
                   <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
-                  <DuctInsulationRValue>6.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>7.0</DuctEffectiveRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>308.0</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
                   <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
-                  <DuctInsulationRValue>6.0</DuctInsulationRValue>
+                  <DuctEffectiveRValue>7.0</DuctEffectiveRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>77.0</DuctSurfaceArea>
                 </Ducts>

diff --git a/workflow/tests/base_results/RESNET_Test_4.2_HERS_AutoGen_Reference_Home.csv b/workflow/tests/base_results/RESNET_Test_4.2_HERS_AutoGen_Reference_Home.csv
@@ -20,8 +20,7 @@ South window area (ft2),69.26,69.26,69.26,102.64
 East window area (ft2),69.26,69.26,69.26,102.64
 West window area (ft2),69.26,69.26,69.26,102.64
 Window U-Factor,0.4,0.65,1.2,0.35
-Window SHGCo (heating),0.33,0.33,0.33,0.33
-Window SHGCo (cooling),0.33,0.33,0.33,0.33
+Window SHGCo,0.33,0.33,0.33,0.33
 SLAo (ft2/ft2),0.00036,0.00036,0.00036,0.00036
 Sensible Internal gains (Btu/day),55142,52470,47839,82721
 Latent Internal gains (Btu/day),13635,12565,9150,17734

diff --git a/workflow/tests/base_results/RESNET_Test_4.5_DSE.csv b/workflow/tests/base_results/RESNET_Test_4.5_DSE.csv
@@ -1,9 +1,9 @@
 Test Case,Heat/Cool (kWh or therm),HVAC Fan (kWh)
 HVAC3a.xml,570.75,226.25
 HVAC3e.xml,6144.82,1199.83
-HVAC3b.xml,682.0,390.66
-HVAC3c.xml,609.97,267.57
-HVAC3d.xml,653.55,443.71
-HVAC3f.xml,7469.21,1450.7
-HVAC3g.xml,6591.75,1284.82
-HVAC3h.xml,7250.58,1384.76
+HVAC3b.xml,696.97,399.16
+HVAC3c.xml,602.01,264.06
+HVAC3d.xml,646.93,439.31
+HVAC3f.xml,7615.16,1483.53
+HVAC3g.xml,6514.97,1267.83
+HVAC3h.xml,7186.98,1370.99
diff --git a/workflow/tests/resnet_hers_test.rb b/workflow/tests/resnet_hers_test.rb
@@ -67,13 +67,15 @@ def test_resnet_ashrae_140
   end
 
   def test_resnet_hers_reference_home_auto_generation
+    version = '2022C'
     all_results = _test_resnet_hers_reference_home_auto_generation('RESNET_Test_4.2_HERS_AutoGen_Reference_Home',
-                                                                   'RESNET_Tests/4.2_HERS_AutoGen_Reference_Home')
+                                                                   'RESNET_Tests/4.2_HERS_AutoGen_Reference_Home',
+                                                                   version)
 
     # Check results
     all_results.each do |xml, results|
       test_num = File.basename(xml)[0, 2].to_i
-      _check_reference_home_components(results, test_num, '2022C')
+      _check_reference_home_components(results, test_num, version)
     end
   end
 

diff --git a/workflow/tests/resnet_other_test.rb b/workflow/tests/resnet_other_test.rb
@@ -19,25 +19,29 @@ def setup
   end
 
   def test_resnet_hers_reference_home_auto_generation_301_2019_pre_addendum_a
+    version = '2019'
     all_results = _test_resnet_hers_reference_home_auto_generation('RESNET_Test_Other_HERS_AutoGen_Reference_Home_301_2019_PreAddendumA',
-                                                                   'RESNET_Tests/Other_HERS_AutoGen_Reference_Home_301_2019_PreAddendumA')
+                                                                   'RESNET_Tests/Other_HERS_AutoGen_Reference_Home_301_2019_PreAddendumA',
+                                                                   version)
 
     # Check results
     all_results.each do |xml, results|
       test_num = File.basename(xml)[0, 2].to_i
-      _check_reference_home_components(results, test_num, '2019')
+      _check_reference_home_components(results, test_num, version)
     end
   end
 
   def test_resnet_hers_reference_home_auto_generation_301_2014
     # Older test w/ 301-2014 mechanical ventilation acceptance criteria
+    version = '2014'
     all_results = _test_resnet_hers_reference_home_auto_generation('RESNET_Test_Other_HERS_AutoGen_Reference_Home_301_2014',
-                                                                   'RESNET_Tests/Other_HERS_AutoGen_Reference_Home_301_2014')
+                                                                   'RESNET_Tests/Other_HERS_AutoGen_Reference_Home_301_2014',
+                                                                   version)
 
     # Check results
     all_results.each do |xml, results|
       test_num = File.basename(xml)[0, 2].to_i
-      _check_reference_home_components(results, test_num, '2014')
+      _check_reference_home_components(results, test_num, version)
     end
   end