Skip to content

Commit df1499e

Browse files
committed
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
# Conflicts: # BuildResidentialHPXML/measure.xml # BuildResidentialHPXML/resources/version.txt [ci skip]
2 parents 814cce1 + 2efb0f4 commit df1499e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

BuildResidentialHPXML/measure.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<schema_version>3.1</schema_version>
44
<name>build_residential_hpxml</name>
55
<uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
6-
<version_id>be9c30a4-6da0-4942-aa43-23a898d10af3</version_id>
7-
<version_modified>2025-01-11T01:57:47Z</version_modified>
6+
<version_id>95c9cd41-0567-4b3c-a0d5-4ccdcac03f37</version_id>
7+
<version_modified>2025-01-16T05:23:16Z</version_modified>
88
<xml_checksum>2C38F48B</xml_checksum>
99
<class_name>BuildResidentialHPXML</class_name>
1010
<display_name>HPXML Builder</display_name>
@@ -7562,7 +7562,7 @@
75627562
<filename>version.txt</filename>
75637563
<filetype>txt</filetype>
75647564
<usage_type>resource</usage_type>
7565-
<checksum>0E8669F5</checksum>
7565+
<checksum>6D7D7910</checksum>
75667566
</file>
75677567
<file>
75687568
<filename>test_build_residential_hpxml.rb</filename>
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18af4ebdce3fee792861f1b710bf8f8f
1+
e8edd0fdf30035cab93a927df4f12ebb

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ This repository contains several OpenStudio measures:
4848
OpenStudio-HPXML is used by a number of software products or organizations, including:
4949

5050
- [BEopt](https://beopt.nrel.gov)
51+
- [Clarity Heat Pump Toolkit](https://psdconsulting.com/solutions/)
5152
- [Energy Rating Index (ERI)](https://github.com/NREL/OpenStudio-ERI)
5253
- [Home Energy Score](https://www.homeenergyscore.gov)
5354
- [OptiMiser](https://optimiserenergy.com)

tasks.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -2664,9 +2664,8 @@ def display_usage(command_list)
26642664
# This will ensure that the BuildResidentialHPXML measure.xml is appropriately updated.
26652665
# Without this, the BuildResidentialHPXML measure has no differences and so OpenStudio
26662666
# would skip updating it.
2667-
version_rb_path = File.join(File.dirname(__FILE__), 'HPXMLtoOpenStudio/resources/version.rb')
26682667
version_txt_path = File.join(File.dirname(__FILE__), 'BuildResidentialHPXML/resources/version.txt')
2669-
File.write(version_txt_path, Digest::MD5.file(version_rb_path).hexdigest)
2668+
File.write(version_txt_path, Digest::MD5.hexdigest(Version::OS_HPXML_Version))
26702669

26712670
# Update measures XMLs
26722671
puts 'Updating measure.xmls...'

0 commit comments

Comments
 (0)