Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…

…o airflow_rb_doc # Conflicts: # HPXMLtoOpenStudio/measure.xml
NREL · Jan 2, 2025 · 7be36df · 7be36df
2 parents 0729338 + f8d5ccb
commit 7be36df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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>f3f296d5-ba53-4fb1-a46b-36bb45ee5fcd</version_id>
-  <version_modified>2025-01-02T23:31:33Z</version_modified>
+  <version_id>b30d5a9d-89d7-4d3f-b0d8-cd4869649fbf</version_id>
+  <version_modified>2025-01-02T23:34:11Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -663,7 +663,7 @@
       <filename>test_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>3EA9D3F5</checksum>
+      <checksum>7E9FC2FA</checksum>
     </file>
     <file>
       <filename>test_enclosure.rb</filename>

diff --git a/HPXMLtoOpenStudio/tests/test_defaults.rb b/HPXMLtoOpenStudio/tests/test_defaults.rb
@@ -3501,10 +3501,10 @@ def test_pv_systems
     _test_default_pv_system_values(default_hpxml_bldg, 0.96, 0.14, false, HPXML::LocationRoof, HPXML::PVTrackingTypeFixed, HPXML::PVModuleTypeStandard, 135)
 
     # Test defaults w/ year modules manufactured
-    pv.year_modules_manufactured = Date.today.year - 14
+    pv.year_modules_manufactured = Date.today.year - 10
     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.198, false, HPXML::LocationRoof, HPXML::PVTrackingTypeFixed, HPXML::PVModuleTypeStandard, 135)
+    _test_default_pv_system_values(default_hpxml_bldg, 0.96, 0.182, false, HPXML::LocationRoof, HPXML::PVTrackingTypeFixed, HPXML::PVModuleTypeStandard, 135)
   end
 
   def test_batteries