Squashed 'hpxml-measures/' changes from cb3775f586..67848fe81e

67848fe81e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ansi_301_2022 93c1313799 Merge pull request #1582 from NREL/mains_above_freezing 087a7e3833 Minor rewording [ci skip] 69d5321afb Merge branch 'master' into mains_above_freezing fd98da1711 Update changelog with bugfix 83d8f84663 rubocop ba318367b5 Fix for mains temperature going below freezing. 2601c24cec Merge pull request #1580 from NREL/update_pv_test aea9901664 Latest results. 6c6424587e Update PV test expected value for 2024. a9d0011a12 Latest results. git-subtree-dir: hpxml-measures git-subtree-split: 67848fe81e8f79b2897fda76fbb6469fa01f80c9
NREL · Jan 4, 2024 · c6059c5 · c6059c5
1 parent e7ac0ed
commit c6059c5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -15,6 +15,7 @@ __New Features__
 
 __Bugfixes__
 - Fixes error if using AllowIncreasedFixedCapacities=true w/ HP detailed performance data.
+- Prevents mains water temperature from going below freezing (0 C).
 
 ## OpenStudio-HPXML v1.7.0
 

diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>da384abd-f2ab-4262-af04-294950d63223</version_id>
-  <version_modified>2023-12-19T02:08:43Z</version_modified>
+  <version_id>036adfcb-fd99-44c5-904f-438e724d94e4</version_id>
+  <version_modified>2024-01-04T00:15:22Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -142,7 +142,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>0EE40834</checksum>
+      <checksum>045BD8A9</checksum>
     </file>
     <file>
       <filename>airflow.rb</filename>
@@ -166,7 +166,7 @@
       <filename>constructions.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>D28BD90F</checksum>
+      <checksum>86823274</checksum>
     </file>
     <file>
       <filename>data/Xing_okstate_0664D_13659_Table_A-3.csv</filename>
@@ -304,13 +304,13 @@
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>30B5878C</checksum>
+      <checksum>B5FC674F</checksum>
     </file>
     <file>
       <filename>hpxml_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>3218405C</checksum>
+      <checksum>AB45F0B9</checksum>
     </file>
     <file>
       <filename>hpxml_schema/HPXML.xsd</filename>
@@ -328,7 +328,7 @@
       <filename>hpxml_schematron/EPvalidator.xml</filename>
       <filetype>xml</filetype>
       <usage_type>resource</usage_type>
-      <checksum>5C4B363E</checksum>
+      <checksum>07465552</checksum>
     </file>
     <file>
       <filename>hpxml_schematron/iso-schematron.xsd</filename>
@@ -364,7 +364,7 @@
       <filename>materials.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>24DCB986</checksum>
+      <checksum>74EB5B1D</checksum>
     </file>
     <file>
       <filename>meta_measure.rb</filename>
@@ -562,7 +562,7 @@
       <filename>weather.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>6E12B2EB</checksum>
+      <checksum>6A61B98A</checksum>
     </file>
     <file>
       <filename>xmlhelper.rb</filename>
@@ -592,13 +592,13 @@
       <filename>test_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>07163DA3</checksum>
+      <checksum>7430EFAB</checksum>
     </file>
     <file>
       <filename>test_enclosure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>833E46A5</checksum>
+      <checksum>427AA4EF</checksum>
     </file>
     <file>
       <filename>test_generator.rb</filename>
@@ -664,7 +664,7 @@
       <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>CA056491</checksum>
+      <checksum>3DA658D5</checksum>
     </file>
     <file>
       <filename>test_water_heater.rb</filename>

diff --git a/HPXMLtoOpenStudio/resources/weather.rb b/HPXMLtoOpenStudio/resources/weather.rb
@@ -386,12 +386,14 @@ def calc_mains_temperatures(n_days)
     for d in 1..n_days
       data.MainsDailyTemps << data.AnnualAvgDrybulb + 6 + tmains_ratio * maxDiffMonthlyAvgOAT / 2 * Math.sin(deg_rad * (0.986 * (d - 15 - tmains_lag) + sign * 90))
     end
+    data.MainsDailyTemps.map! { |temp| [32.0, temp].max } # ensure mains never gets below freezing. Algorithm will never provide water over boiling without a check
     data.MainsAnnualTemp = data.MainsDailyTemps.sum / n_days
 
     # Calculate monthly
     data.MainsMonthlyTemps = []
     for m in 1..12
       data.MainsMonthlyTemps << data.AnnualAvgDrybulb + 6 + tmains_ratio * maxDiffMonthlyAvgOAT / 2 * Math.sin(deg_rad * (0.986 * ((m * 30 - 15) - 15 - tmains_lag) + sign * 90))
     end
+    data.MainsMonthlyTemps.map! { |temp| [32.0, temp].max } # ensure mains never gets below freezing. Algorithm will never provide water over boiling without a check
   end
 end
diff --git a/HPXMLtoOpenStudio/tests/test_defaults.rb b/HPXMLtoOpenStudio/tests/test_defaults.rb
@@ -2811,7 +2811,7 @@ def test_pv_systems
     pv.year_modules_manufactured = 2010
     XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
     _default_hpxml, default_hpxml_bldg = _test_measure()
-    _test_default_pv_system_values(default_hpxml_bldg, 0.96, 0.194, false, HPXML::LocationRoof, HPXML::PVTrackingTypeFixed, HPXML::PVModuleTypeStandard, 135)
+    _test_default_pv_system_values(default_hpxml_bldg, 0.96, 0.198, false, HPXML::LocationRoof, HPXML::PVTrackingTypeFixed, HPXML::PVModuleTypeStandard, 135)
   end
 
   def test_batteries

diff --git a/workflow/tests/base_results/results_workflow_simulations1.csv b/workflow/tests/base_results/results_workflow_simulations1.csv
@@ -13,7 +13,8 @@ base-appliances-wood.xml,59.503,59.503,33.004,33.004,21.633,0.0,0.0,4.866,0.0,0.
 base-atticroof-cathedral.xml,61.238,61.238,35.599,35.599,25.639,0.0,0.0,0.0,0.0,0.0,0.0,0.423,0.0,0.0,4.111,0.771,9.018,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,25.639,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,23.991,0.0,13.195,9.075,0.616,0.0,0.0,0.0,0.0,2123.4,3227.4,3227.4,22.717,16.531,6.779,0.0,4.237,0.513,7.504,0.634,12.709,-15.639,0.0,0.0,0.0,8.361,-0.09,9.326,0.0,0.73,0.0,0.0,-8.941,-2.505,0.162,0.0,-0.491,-0.046,2.78,-0.014,-1.137,15.661,0.0,0.0,0.0,-6.3,-0.065,-2.048,-4.743,-0.156,0.0,0.0,7.839,2.004,1354.8,997.6,11171.6,2563.5,0.0,36000.0,24000.0,0.0,6.8,91.76,29821.0,0.0,9510.0,0.0,575.0,7194.0,3697.0,0.0,1949.0,0.0,6896.0,15704.0,0.0,9971.0,0.0,207.0,302.0,975.0,0.0,0.0,0.0,929.0,3320.0,0.0,0.0,0.0,0.0
 base-atticroof-conditioned.xml,62.949,62.949,40.328,40.328,22.621,0.0,0.0,0.0,0.0,0.0,0.0,0.373,0.0,0.0,4.739,0.92,8.923,0.0,0.0,5.751,0.0,0.398,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,11.166,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.621,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.169,0.0,15.797,9.023,0.614,0.0,0.0,0.0,0.0,2397.3,3596.6,3596.6,22.528,19.772,4.574,1.169,5.574,0.521,7.699,0.639,14.508,-17.155,0.0,0.0,0.0,8.591,-0.088,7.116,0.0,0.733,0.0,0.274,-10.231,-3.183,0.013,0.023,-0.555,-0.052,2.707,-0.027,-1.833,17.683,0.0,0.0,0.0,-6.319,-0.082,-1.664,-5.237,-0.165,0.0,0.092,8.933,2.568,1354.8,997.6,11171.6,2471.3,0.0,36000.0,24000.0,0.0,6.8,91.76,31468.0,778.0,10436.0,0.0,575.0,7982.0,2464.0,0.0,1949.0,724.0,6561.0,18531.0,0.0,11700.0,0.0,207.0,1098.0,650.0,0.0,0.0,670.0,886.0,3320.0,0.0,0.0,0.0,0.0
 base-atticroof-flat.xml,54.356,54.356,34.89,34.89,19.466,0.0,0.0,0.0,0.0,0.0,0.0,0.321,0.0,0.0,3.616,0.659,9.018,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.466,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,18.216,0.0,11.263,9.075,0.615,0.0,0.0,0.0,0.0,2121.3,2762.8,2762.8,17.648,12.809,6.045,0.0,3.619,0.509,7.465,0.625,10.03,-12.687,0.0,0.0,0.0,8.23,-0.076,4.799,0.0,0.728,0.0,0.0,-8.908,-2.5,0.317,0.0,-0.439,-0.048,2.755,-0.02,-1.334,11.721,0.0,0.0,0.0,-6.221,-0.05,-1.135,-3.78,-0.161,0.0,0.0,7.871,2.01,1354.8,997.6,11171.5,2563.5,0.0,36000.0,24000.0,0.0,6.8,91.76,24776.0,0.0,7508.0,0.0,575.0,6840.0,3307.0,0.0,1949.0,0.0,4597.0,12320.0,0.0,7037.0,0.0,207.0,265.0,872.0,0.0,0.0,0.0,619.0,3320.0,0.0,0.0,0.0,0.0
-base-atticroof-radiant-barrier.xml,37.246,37.246,33.093,33.093,4.154,0.0,0.0,0.0,0.0,0.0,0.0,0.018,0.0,0.0,9.291,1.938,6.715,0.0,0.0,2.647,0.0,0.238,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,4.187,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.154,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.835,0.0,32.335,6.562,0.58,0.0,0.0,0.0,0.0,1903.9,3238.0,3238.0,13.531,18.845,0.0,6.131,1.575,0.0,0.0,0.336,4.357,-5.9,0.0,0.0,0.0,0.823,-0.362,0.993,0.0,0.398,0.0,0.103,-4.0,-0.845,0.0,2.45,0.149,0.0,0.0,0.207,2.929,16.271,0.0,0.0,0.0,2.089,-0.355,-0.271,-2.129,-0.049,0.0,0.377,9.163,1.802,1354.8,997.6,9789.2,2412.1,0.0,24000.0,24000.0,0.0,25.88,98.42,25739.0,1416.0,5241.0,0.0,401.0,1535.0,0.0,0.0,8539.0,6846.0,1760.0,22161.0,65.0,7662.0,0.0,313.0,637.0,0.0,0.0,0.0,9596.0,568.0,3320.0,1630.0,438.0,393.0,800.0
+base-atticroof-radiant-barrier-ceiling.xml,38.278,38.278,33.512,33.512,4.766,0.0,0.0,0.0,0.0,0.0,0.0,0.021,0.0,0.0,9.634,2.01,6.716,0.0,0.0,2.647,0.0,0.238,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,4.187,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.766,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.402,0.0,33.547,6.562,0.581,0.0,0.0,0.0,0.0,2084.5,3439.1,3439.1,14.269,20.469,0.0,7.073,1.549,0.0,0.0,0.337,4.353,-5.956,0.0,0.0,0.0,0.658,-0.419,0.994,0.0,0.4,0.0,0.117,-4.054,-0.857,0.0,3.731,0.15,0.0,0.0,0.215,2.993,16.24,0.0,0.0,0.0,2.005,-0.41,-0.254,-2.059,-0.042,0.0,0.39,9.111,1.79,1354.8,997.6,9789.2,2412.1,0.0,24000.0,24000.0,0.0,25.88,98.42,25739.0,1416.0,5241.0,0.0,401.0,1535.0,0.0,0.0,8539.0,6846.0,1760.0,25263.0,63.0,7662.0,0.0,313.0,637.0,0.0,0.0,0.0,12699.0,568.0,3320.0,1630.0,438.0,393.0,800.0
+base-atticroof-radiant-barrier.xml,37.12,37.12,33.067,33.067,4.054,0.0,0.0,0.0,0.0,0.0,0.0,0.017,0.0,0.0,9.27,1.934,6.715,0.0,0.0,2.647,0.0,0.238,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,4.187,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.054,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.743,0.0,32.244,6.562,0.58,0.0,0.0,0.0,0.0,1884.8,3234.7,3234.7,13.389,18.803,0.0,5.961,1.573,0.0,0.0,0.336,4.356,-5.864,0.0,0.0,0.0,0.844,-0.36,0.991,0.0,0.396,0.0,0.1,-3.98,-0.839,0.0,2.328,0.141,0.0,0.0,0.206,2.913,16.307,0.0,0.0,0.0,2.092,-0.353,-0.276,-2.136,-0.052,0.0,0.375,9.183,1.808,1354.8,997.6,9789.2,2412.1,0.0,24000.0,24000.0,0.0,25.88,98.42,25739.0,1416.0,5241.0,0.0,401.0,1535.0,0.0,0.0,8539.0,6846.0,1760.0,22161.0,65.0,7662.0,0.0,313.0,637.0,0.0,0.0,0.0,9596.0,568.0,3320.0,1630.0,438.0,393.0,800.0
 base-atticroof-unvented-insulated-roof.xml,56.882,56.882,35.057,35.057,21.825,0.0,0.0,0.0,0.0,0.0,0.0,0.36,0.0,0.0,3.724,0.679,9.018,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,21.825,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.425,0.0,11.582,9.075,0.616,0.0,0.0,0.0,0.0,2115.1,2855.4,2855.4,19.246,14.086,0.0,5.473,3.627,0.51,7.486,0.627,10.052,-12.69,0.0,0.0,0.0,8.297,-0.061,4.803,0.0,0.729,0.0,2.655,-8.912,-2.5,0.0,-1.406,-0.407,-0.044,2.853,-0.012,-1.237,11.723,0.0,0.0,0.0,-6.053,-0.053,-1.113,-3.567,-0.159,0.0,1.398,7.868,2.009,1354.8,997.6,11171.6,2563.5,0.0,36000.0,24000.0,0.0,6.8,91.76,30482.0,4823.0,7508.0,0.0,575.0,6840.0,0.0,0.0,1949.0,4190.0,4597.0,19417.0,1772.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,6198.0,619.0,3320.0,0.0,0.0,0.0,0.0
 base-atticroof-vented.xml,57.482,57.482,35.385,35.385,22.097,0.0,0.0,0.0,0.0,0.0,0.0,0.365,0.0,0.0,3.843,0.708,9.193,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,22.097,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.691,0.0,12.183,9.075,0.803,0.0,0.0,0.0,0.0,2132.9,2979.5,2979.5,21.537,15.322,0.0,3.899,3.639,0.512,7.516,0.63,10.087,-12.691,0.0,0.0,0.0,8.312,-0.061,4.804,0.0,0.729,0.0,4.07,-8.579,-2.5,0.0,-0.51,-0.431,-0.047,2.775,-0.018,-1.303,11.723,0.0,0.0,0.0,-6.195,-0.057,-1.134,-3.721,-0.161,0.0,1.888,7.585,2.009,1354.8,997.6,11171.5,2563.5,0.0,36000.0,24000.0,0.0,6.8,91.76,32235.0,8595.0,7508.0,0.0,575.0,6840.0,0.0,0.0,1949.0,2171.0,4597.0,16425.0,3714.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,1263.0,619.0,3320.0,0.0,0.0,0.0,0.0
 base-battery-scheduled.xml,59.728,59.728,37.442,37.442,22.286,0.0,0.0,0.0,0.0,0.0,0.0,0.368,0.0,0.0,4.247,0.8,9.017,0.0,0.0,4.51,0.0,0.334,0.0,0.0,0.0,0.0,2.22,0.0,0.0,0.319,0.365,1.513,1.528,0.0,2.114,8.374,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.735,22.286,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,20.87,0.0,13.895,9.075,0.615,0.0,0.0,0.0,0.0,2224.6,3483.1,3483.1,23.032,18.896,0.0,3.556,3.644,0.513,7.531,0.631,10.1,-12.683,0.0,0.0,0.0,8.326,-0.063,4.806,0.0,0.729,0.0,4.837,-8.905,-2.499,0.0,-0.035,-0.447,-0.049,2.731,-0.022,-1.353,11.73,0.0,0.0,0.0,-6.264,-0.059,-1.147,-3.828,-0.163,0.0,3.082,7.874,2.011,1354.8,997.6,11171.6,2563.5,1.309,36000.0,24000.0,0.0,6.8,91.76,32235.0,8595.0,7508.0,0.0,575.0,6840.0,0.0,0.0,1949.0,2171.0,4597.0,18787.0,5329.0,7037.0,0.0,207.0,265.0,0.0,0.0,0.0,2010.0,619.0,3320.0,0.0,0.0,0.0,0.0

diff --git a/workflow/tests/base_results/results_workflow_simulations1_bills.csv b/workflow/tests/base_results/results_workflow_simulations1_bills.csv
@@ -13,7 +13,8 @@ base-appliances-wood.xml,1801.43,144.0,1211.28,0.0,1355.28,144.0,229.16,373.16,0
 base-atticroof-cathedral.xml,1866.09,144.0,1306.49,0.0,1450.49,144.0,271.6,415.6,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-atticroof-conditioned.xml,2007.7,144.0,1480.07,0.0,1624.07,144.0,239.63,383.63,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-atticroof-flat.xml,1774.68,144.0,1280.47,0.0,1424.47,144.0,206.21,350.21,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-atticroof-radiant-barrier.xml,1542.21,144.0,1211.16,0.0,1355.16,144.0,43.05,187.05,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-atticroof-radiant-barrier-ceiling.xml,1563.89,144.0,1226.49,0.0,1370.49,144.0,49.4,193.4,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-atticroof-radiant-barrier.xml,1540.21,144.0,1210.2,0.0,1354.2,144.0,42.01,186.01,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-atticroof-unvented-insulated-roof.xml,1805.81,144.0,1286.61,0.0,1430.61,144.0,231.2,375.2,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-atticroof-vented.xml,1820.73,144.0,1298.65,0.0,1442.65,144.0,234.08,378.08,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
 base-battery-scheduled.xml,1897.43,144.0,1373.35,0.0,1517.35,144.0,236.08,380.08,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0