Skip to content

Commit 2132765

Browse files
shorowitshorowit
authored
Merge pull request #1806 from NREL/hpxml_4rc5
Update to HPXML v4.0-rc5
2 parents f833c8c + ecc0c34 commit 2132765

File tree

3 files changed

+87
-17
lines changed

3 files changed

+87
-17
lines changed

‎Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## OpenStudio-HPXML v1.9.0
22

33
__New Features__
4+
- Updates to HPXML v4.0-rc5.
45
- Adds inputs for modeling skylight curbs and/or shafts.
56
- Allows alternative infiltration input `AirInfiltrationMeasurement/LeakinessDescription`, in which the infiltration level is estimated using age of home, climate zone, foundation type, etc.
67
- Central Fan Integrated Supply (CFIS) mechanical ventilation enhancements:

‎HPXMLtoOpenStudio/measure.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<schema_version>3.1</schema_version>
44
<name>hpxm_lto_openstudio</name>
55
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
6-
<version_id>3336bfc1-03f6-451a-88d5-d0f098879a56</version_id>
7-
<version_modified>2024-08-12T14:27:20Z</version_modified>
6+
<version_id>750796d0-c072-40f1-ab6a-2ed3d215d130</version_id>
7+
<version_modified>2024-08-12T22:41:49Z</version_modified>
88
<xml_checksum>D8922A73</xml_checksum>
99
<class_name>HPXMLtoOpenStudio</class_name>
1010
<display_name>HPXML to OpenStudio Translator</display_name>
@@ -357,7 +357,7 @@
357357
<filename>hpxml_schema/HPXML.xsd</filename>
358358
<filetype>xsd</filetype>
359359
<usage_type>resource</usage_type>
360-
<checksum>48EC92CD</checksum>
360+
<checksum>6C78351F</checksum>
361361
</file>
362362
<file>
363363
<filename>hpxml_schema/README.md</filename>
@@ -630,10 +630,16 @@
630630
<checksum>93120E27</checksum>
631631
</file>
632632
<file>
633-
<filename>in.schedules.csv</filename>
634-
<filetype>csv</filetype>
633+
<filename>results_annual.json</filename>
634+
<filetype>json</filetype>
635+
<usage_type>test</usage_type>
636+
<checksum>0F850D04</checksum>
637+
</file>
638+
<file>
639+
<filename>results_design_load_details.json</filename>
640+
<filetype>json</filetype>
635641
<usage_type>test</usage_type>
636-
<checksum>1E533016</checksum>
642+
<checksum>43478902</checksum>
637643
</file>
638644
<file>
639645
<filename>test_airflow.rb</filename>

‎HPXMLtoOpenStudio/resources/hpxml_schema/HPXML.xsd

Lines changed: 74 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
<xs:group ref="SystemInfo"/>
230230
<xs:element minOccurs="0" name="InsulationGrade" type="InsulationGrade"/>
231231
<xs:element minOccurs="0" name="InsulationCondition" type="InsulationCondition"/>
232-
<xs:element minOccurs="0" name="AssemblyEffectiveRValue" type="AssemblyRValue">
232+
<xs:element minOccurs="0" name="AssemblyEffectiveRValue" type="RValueGreaterThanZero">
233233
<xs:annotation>
234234
<xs:documentation>This should indicate the effective R-value of the complete assembly including any air films or other treatments. For below-grade surfaces adjacent to ground, it should not include the insulating effect of the ground.</xs:documentation>
235235
</xs:annotation>
@@ -1350,7 +1350,7 @@
13501350
<xs:element name="DoorMaterial" type="DoorMaterial" minOccurs="0"/>
13511351
<xs:element minOccurs="0" name="WeatherStripping" type="HPXMLBoolean"/>
13521352
<xs:element name="StormDoor" type="HPXMLBoolean" minOccurs="0"/>
1353-
<xs:element name="RValue" type="RValue" minOccurs="0"/>
1353+
<xs:element name="RValue" type="RValueGreaterThanZero" minOccurs="0"/>
13541354
<xs:element minOccurs="0" name="LeakinessDescription" type="BuildingLeakiness"/>
13551355
<xs:element minOccurs="0" name="PerformanceClass" type="PerformanceClass"/>
13561356
<xs:element maxOccurs="unbounded" minOccurs="0" name="ThirdPartyCertification" type="DoorThirdPartyCertifications"/>
@@ -1801,7 +1801,7 @@
18011801
</xs:annotation>
18021802
</xs:element>
18031803
<xs:element name="MeetsACCA5QIHVACSpecification" type="HPXMLBoolean" minOccurs="0"/>
1804-
<xs:element name="HotWaterTemperature" type="Temperature" minOccurs="0">
1804+
<xs:element name="HotWaterTemperature" type="TemperatureGreaterThanZero" minOccurs="0">
18051805
<xs:annotation>
18061806
<xs:documentation>[deg F]</xs:documentation>
18071807
</xs:annotation>
@@ -2144,6 +2144,14 @@
21442144
<xs:attribute name="dataSource" type="DataSource"/>
21452145
</xs:complexType>
21462146
</xs:element>
2147+
<xs:element minOccurs="0" name="ElectricPanels">
2148+
<xs:complexType>
2149+
<xs:sequence>
2150+
<xs:element maxOccurs="unbounded" name="ElectricPanel" type="ElectricPanelType"> </xs:element>
2151+
</xs:sequence>
2152+
<xs:attribute name="dataSource" type="DataSource"/>
2153+
</xs:complexType>
2154+
</xs:element>
21472155
<xs:element minOccurs="0" name="Batteries">
21482156
<xs:complexType>
21492157
<xs:sequence>
@@ -3967,7 +3975,7 @@
39673975
<xs:documentation>Describes ducts buried in, e.g., attic loose-fill insulation. Partially buried ducts have insulation that does not cover the top of the ducts. Fully buried ducts have insulation that just covers the top of the ducts. Deeply buried ducts have insulation that continues above the top of the ducts. See https://basc.pnnl.gov/resource-guides/ducts-buried-attic-insulation for more information.</xs:documentation>
39683976
</xs:annotation>
39693977
</xs:element>
3970-
<xs:element minOccurs="0" name="DuctEffectiveRValue" type="RValue">
3978+
<xs:element minOccurs="0" name="DuctEffectiveRValue" type="RValueGreaterThanZero">
39713979
<xs:annotation>
39723980
<xs:documentation>The overall effective R-value. Includes the exterior air film as well as other effects such as adjustments for insulation wrapped around round ducts, or ducts buried in attic insulation.</xs:documentation>
39733981
</xs:annotation>
@@ -5690,12 +5698,12 @@
56905698
<xs:element minOccurs="0" ref="ConnectedDevice"/>
56915699
<xs:element minOccurs="0" ref="AttachedToZone"/>
56925700
<xs:element name="ControlType" type="ThermostatType" minOccurs="0"/>
5693-
<xs:element name="SetpointTempHeatingSeason" type="Temperature" minOccurs="0">
5701+
<xs:element name="SetpointTempHeatingSeason" type="TemperatureGreaterThanZero" minOccurs="0">
56945702
<xs:annotation>
56955703
<xs:documentation>[deg F]</xs:documentation>
56965704
</xs:annotation>
56975705
</xs:element>
5698-
<xs:element name="SetbackTempHeatingSeason" type="Temperature" minOccurs="0">
5706+
<xs:element name="SetbackTempHeatingSeason" type="TemperatureGreaterThanZero" minOccurs="0">
56995707
<xs:annotation>
57005708
<xs:documentation>[deg F]</xs:documentation>
57015709
</xs:annotation>
@@ -5705,12 +5713,12 @@
57055713
<xs:documentation>[hours]</xs:documentation>
57065714
</xs:annotation>
57075715
</xs:element>
5708-
<xs:element name="SetupTempCoolingSeason" type="Temperature" minOccurs="0">
5716+
<xs:element name="SetupTempCoolingSeason" type="TemperatureGreaterThanZero" minOccurs="0">
57095717
<xs:annotation>
57105718
<xs:documentation>[deg F]</xs:documentation>
57115719
</xs:annotation>
57125720
</xs:element>
5713-
<xs:element name="SetpointTempCoolingSeason" type="Temperature" minOccurs="0">
5721+
<xs:element name="SetpointTempCoolingSeason" type="TemperatureGreaterThanZero" minOccurs="0">
57145722
<xs:annotation>
57155723
<xs:documentation>[deg F]</xs:documentation>
57165724
</xs:annotation>
@@ -6276,6 +6284,22 @@
62766284
</xs:sequence>
62776285
<xs:attribute name="dataSource" type="DataSource"/>
62786286
</xs:complexType>
6287+
<xs:complexType name="ElectricPanelType">
6288+
<xs:sequence>
6289+
<xs:group ref="SystemInfo"/>
6290+
<xs:element minOccurs="0" name="Manufacturer" type="Manufacturer"/>
6291+
<xs:element minOccurs="0" name="Model" type="Model"/>
6292+
<xs:element minOccurs="0" name="Location" type="BatteryLocation"/>
6293+
<xs:element minOccurs="0" name="Voltage" type="ElectricPanelVoltage"/>
6294+
<xs:element minOccurs="0" name="MaxCurrentRating" type="Current">
6295+
<xs:annotation>
6296+
<xs:documentation>[A]</xs:documentation>
6297+
</xs:annotation>
6298+
</xs:element>
6299+
<xs:element minOccurs="0" ref="extension"/>
6300+
</xs:sequence>
6301+
<xs:attribute name="dataSource" type="DataSource"/>
6302+
</xs:complexType>
62796303
<xs:simpleType name="DataSource">
62806304
<xs:restriction base="xs:string">
62816305
<xs:enumeration value="user"/>
@@ -7564,14 +7588,14 @@
75647588
</xs:simpleContent>
75657589
</xs:complexType>
75667590
<!--Insulation Below-->
7567-
<xs:simpleType name="AssemblyRValue_simple">
7591+
<xs:simpleType name="RValueGreaterThanZero_simple">
75687592
<xs:restriction base="xs:double">
75697593
<xs:minExclusive value="0"/>
75707594
</xs:restriction>
75717595
</xs:simpleType>
7572-
<xs:complexType name="AssemblyRValue">
7596+
<xs:complexType name="RValueGreaterThanZero">
75737597
<xs:simpleContent>
7574-
<xs:extension base="AssemblyRValue_simple">
7598+
<xs:extension base="RValueGreaterThanZero_simple">
75757599
<xs:attribute name="dataSource" type="DataSource"/>
75767600
</xs:extension>
75777601
</xs:simpleContent>
@@ -7863,6 +7887,7 @@
78637887
<xs:restriction base="xs:string">
78647888
<xs:enumeration value="Energy Star"/>
78657889
<xs:enumeration value="Energy Star Most Efficient"/>
7890+
<xs:enumeration value="Energy Star Cold Climate Heat Pump"/>
78667891
<xs:enumeration value="CEE Tier 1"/>
78677892
<xs:enumeration value="CEE Tier 2"/>
78687893
<xs:enumeration value="CEE Tier 3"/>
@@ -8572,6 +8597,18 @@
85728597
</xs:extension>
85738598
</xs:simpleContent>
85748599
</xs:complexType>
8600+
<xs:simpleType name="TemperatureGreaterThanZero_simple">
8601+
<xs:restriction base="xs:double">
8602+
<xs:minExclusive value="0"/>
8603+
</xs:restriction>
8604+
</xs:simpleType>
8605+
<xs:complexType name="TemperatureGreaterThanZero">
8606+
<xs:simpleContent>
8607+
<xs:extension base="TemperatureGreaterThanZero_simple">
8608+
<xs:attribute name="dataSource" type="DataSource"/>
8609+
</xs:extension>
8610+
</xs:simpleContent>
8611+
</xs:complexType>
85758612
<xs:simpleType name="ThermostatType_simple">
85768613
<xs:restriction base="xs:string">
85778614
<xs:enumeration value="programmable thermostat"/>
@@ -11329,4 +11366,30 @@
1132911366
</xs:extension>
1133011367
</xs:simpleContent>
1133111368
</xs:complexType>
11369+
<xs:simpleType name="ElectricPanelMainOrSub_simple">
11370+
<xs:restriction base="xs:string">
11371+
<xs:enumeration value="main"/>
11372+
<xs:enumeration value="sub"/>
11373+
</xs:restriction>
11374+
</xs:simpleType>
11375+
<xs:complexType name="ElectricPanelMainOrSub">
11376+
<xs:simpleContent>
11377+
<xs:extension base="ElectricPanelMainOrSub_simple">
11378+
<xs:attribute name="dataSource" type="DataSource"/>
11379+
</xs:extension>
11380+
</xs:simpleContent>
11381+
</xs:complexType>
11382+
<xs:simpleType name="ElectricPanelVoltage_simple">
11383+
<xs:restriction base="xs:integer">
11384+
<xs:enumeration value="120"/>
11385+
<xs:enumeration value="240"/>
11386+
</xs:restriction>
11387+
</xs:simpleType>
11388+
<xs:complexType name="ElectricPanelVoltage">
11389+
<xs:simpleContent>
11390+
<xs:extension base="ElectricPanelVoltage_simple">
11391+
<xs:attribute name="dataSource" type="DataSource"/>
11392+
</xs:extension>
11393+
</xs:simpleContent>
11394+
</xs:complexType>
1133211395
</xs:schema>

0 commit comments

Comments
 (0)