Skip to content

Commit

Permalink
Merge branch 'master' into solar_collector_efficiency_units
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmerket
nmerket committed Jun 11, 2021
2 parents 22173e6 + b09eb65 commit a2f92b0
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 92 deletions.
85 changes: 68 additions & 17 deletions schemas/BaseElements.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" name="InsulationGrade" type="InsulationGrade"/>
<xs:element minOccurs="0" name="InsulationCondition" type="InsulationCondition"/>
<xs:element minOccurs="0" name="AssemblyEffectiveRValue" type="RValue">
<xs:element minOccurs="0" name="AssemblyEffectiveRValue" type="AssemblyRValue">
<xs:annotation>
<xs:documentation>This should indicate the effective R-value of the complete assembly including any air films or other treatments.</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -242,7 +242,7 @@
<xs:element name="FuelType" type="FuelType" minOccurs="0"/>
<xs:element minOccurs="0" name="Usage" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>loads/week</xs:documentation>
<xs:documentation>loads/week of actual usage by the occupants</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="EnergyFactor" type="HPXMLDouble">
Expand Down Expand Up @@ -294,7 +294,7 @@
</xs:element>
<xs:element minOccurs="0" name="Usage" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>loads/week</xs:documentation>
<xs:documentation>loads/week of actual usage by the occupants; use LabelUsage instead for the loads/week on the EnergyGuide label</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="RatedAnnualkWh" type="RatedAnnualkWh">
Expand All @@ -317,6 +317,11 @@
<xs:documentation>$</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="LabelUsage" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>loads/week per the Energy Guide label; use Usage instead for loads/week of actual usage by the occupants</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="Capacity" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>ft^3</xs:documentation>
Expand All @@ -343,7 +348,27 @@
<xs:element minOccurs="0" name="PlaceSettingCapacity" type="IntegerGreaterThanZero"/>
<xs:element minOccurs="0" name="Usage" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>loads/week</xs:documentation>
<xs:documentation>loads/week of actual usage by the occupants; use LabelUsage instead for the loads/week on the EnergyGuide label</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="LabelElectricRate" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>$/kWh</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="LabelGasRate" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>$/therm</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="LabelAnnualGasCost" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>$</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="LabelUsage" type="HPXMLDouble">
<xs:annotation>
<xs:documentation>loads/week per the Energy Guide label; use Usage instead for loads/week of actual usage by the occupants</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element ref="extension" minOccurs="0"/>
Expand Down Expand Up @@ -744,6 +769,7 @@
</xs:element>
<xs:element name="RadiantBarrier" type="HPXMLBoolean" minOccurs="0"/>
<xs:element name="RadiantBarrierLocation" type="RadiantBarrierLocation" minOccurs="0"/>
<xs:element name="RadiantBarrierGrade" type="InsulationGrade" minOccurs="0"/>
<xs:element minOccurs="0" name="Insulation" type="InsulationInfo"/>
<xs:element ref="extension" minOccurs="0"/>
</xs:sequence>
Expand Down Expand Up @@ -780,6 +806,8 @@
<xs:documentation>[ft]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="Siding" type="Siding"/>
<xs:element minOccurs="0" name="Color" type="WallAndRoofColor"/>
<xs:element minOccurs="0" name="SolarAbsorptance" type="SolarAbsorptance"/>
<xs:element minOccurs="0" name="Emittance" type="Emittance"/>
<xs:element minOccurs="0" name="Insulation" type="InsulationInfo"/>
Expand Down Expand Up @@ -1108,6 +1136,7 @@
<xs:element name="StormDoor" type="HPXMLBoolean" minOccurs="0"/>
<xs:element name="RValue" type="RValue" minOccurs="0"/>
<xs:element minOccurs="0" name="LeakinessDescription" type="BuildingLeakiness"/>
<xs:element minOccurs="0" name="PerformanceClass" type="PerformanceClass"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="ThirdPartyCertification" type="DoorThirdPartyCertifications"/>
<xs:element name="AnnualEnergyUse" minOccurs="0">
<xs:complexType>
Expand Down Expand Up @@ -1183,18 +1212,14 @@
<xs:documentation>[sq.ft.] Conditioned floor area that this distribution system serves.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="AnnualHeatingDistributionSystemEfficiency" type="HPXMLDouble">
<xs:element minOccurs="0" name="AnnualHeatingDistributionSystemEfficiency" type="Fraction">
<xs:annotation>
<xs:documentation>For software that does not calculate an annual distribution system efficiency (DSE) for heating, the DSE may be approximated by equation
3.4.i in ANSI/BPI-2400-S-2012: Standard Practice for Standardized Qualification of Whole-House Energy Savings, Predictions by Calibration to Energy Use
History.</xs:documentation>
<xs:documentation>For software that does not calculate an annual distribution system efficiency (DSE) for heating, the DSE may be approximated by equation 3.4.i in ANSI/BPI-2400-S-2012: Standard Practice for Standardized Qualification of Whole-House Energy Savings, Predictions by Calibration to Energy Use History. Enter values as a fractional number between 0 and 1, i.e. 80% = 0.8</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="AnnualCoolingDistributionSystemEfficiency" type="HPXMLDouble">
<xs:element minOccurs="0" name="AnnualCoolingDistributionSystemEfficiency" type="Fraction">
<xs:annotation>
<xs:documentation>For software that does not calculate an annual distribution system efficiency (DSE) for cooling, the DSE may be approximated by equation
3.4.i in ANSI/BPI-2400-S-2012: Standard Practice for Standardized Qualification of Whole-House Energy Savings, Predictions by Calibration to Energy Use
History.</xs:documentation>
<xs:documentation>For software that does not calculate an annual distribution system efficiency (DSE) for cooling, the DSE may be approximated by equation 3.4.i in ANSI/BPI-2400-S-2012: Standard Practice for Standardized Qualification of Whole-House Energy Savings, Predictions by Calibration to Energy Use History. Enter values as a fractional number between 0 and 1, i.e. 80% = 0.8</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="HVACDistributionImprovement" type="HVACDistributionImprovementInfo"/>
Expand Down Expand Up @@ -1239,6 +1264,11 @@
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="Manufacturer" type="HPXMLString"/>
<xs:element minOccurs="0" name="SerialNumber" type="HPXMLString"/>
<xs:element minOccurs="0" name="Quantity" type="IntegerGreaterThanZero">
<xs:annotation>
<xs:documentation>Number of similar ventilation fans (e.g., bath fans).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="FanType" type="VentilationFanType"/>
<xs:element minOccurs="0" name="RatedFlowRate" type="HPXMLDouble">
<xs:annotation>
Expand Down Expand Up @@ -1378,7 +1408,11 @@
<xs:element name="ModelNumber" type="Model" minOccurs="0"/>
<xs:element minOccurs="0" name="AHRINumber" type="HPXMLString"/>
<xs:element minOccurs="0" name="SerialNumber" type="HPXMLString"/>
<xs:element minOccurs="0" name="PerformanceAdjustment" type="Fraction"/>
<xs:element minOccurs="0" name="PerformanceAdjustment" type="Fraction">
<xs:annotation>
<xs:documentation>A multiplier on the performance of the system. A value of 1 implies no performance adjustment.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="ThirdPartyCertification" type="DHWThirdPartyCertification" maxOccurs="unbounded"/>
<xs:element name="TankVolume" type="Volume" minOccurs="0">
<xs:annotation>
Expand Down Expand Up @@ -1654,6 +1688,7 @@
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
Expand Down Expand Up @@ -3013,7 +3048,11 @@
<xs:element name="ModelNumber" type="Model" minOccurs="0"/>
<xs:element minOccurs="0" name="SerialNumber" type="HPXMLString"/>
<xs:element minOccurs="0" name="AHRINumber" type="HPXMLString"/>
<xs:element minOccurs="0" name="PerformanceAdjustment" type="Fraction"/>
<xs:element minOccurs="0" name="PerformanceAdjustment" type="Fraction">
<xs:annotation>
<xs:documentation>A multiplier on the performance of the system. A value of 1 implies no performance adjustment.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="ThirdPartyCertification" type="HVACThirdPartyCertification"/>
<xs:element minOccurs="0" name="HasSharedCombustionVentilation" type="HPXMLBoolean"/>
<xs:element minOccurs="0" name="CombustionVentingSystem" type="LocalReference"/>
Expand Down Expand Up @@ -4445,6 +4484,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" name="GlazingMaterial" type="GlazingMaterial"/>
<xs:element minOccurs="0" name="GlassType" type="GlassType"/>
<xs:element minOccurs="0" name="FrameType" type="WindowFrameType"/>
<xs:element minOccurs="0" name="Operable" type="HPXMLBoolean"/>
Expand Down Expand Up @@ -4492,6 +4532,7 @@
<xs:element minOccurs="0" name="WeatherStripping" type="HPXMLBoolean"/>
<xs:element minOccurs="0" name="Operable" type="HPXMLBoolean"/>
<xs:element minOccurs="0" name="LeakinessDescription" type="BuildingLeakiness"/>
<xs:element minOccurs="0" name="PerformanceClass" type="PerformanceClass"/>
</xs:sequence>
</xs:group>
<xs:complexType name="WindowFrameType">
Expand Down Expand Up @@ -4753,9 +4794,6 @@
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
<xs:complexType name="WallType">
<xs:annotation>
<xs:documentation>Wall type enumerations are further explained at https://hpxml.nrel.gov/wiki/WallTypes</xs:documentation>
</xs:annotation>
<xs:choice>
<xs:element name="WoodStud">
<xs:complexType>
Expand All @@ -4770,6 +4808,11 @@
<xs:documentation>Please specify stud spacing and framing factor in the appropriate places as well.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="FramingType" type="FramingType">
<xs:annotation>
<xs:documentation>See https://thecraftsmanblog.com/framing-timber-balloon-platform for a description of different framing types.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
<xs:attribute name="dataSource" type="DataSource"/>
Expand Down Expand Up @@ -4865,6 +4908,14 @@
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
</xs:element>
<xs:element name="Adobe">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
</xs:element>
<xs:element name="Other">
<xs:complexType>
<xs:sequence>
Expand Down
137 changes: 62 additions & 75 deletions schemas/HPXMLDataTypes.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,18 @@
</xs:simpleContent>
</xs:complexType>
<!--Insulation Below-->
<xs:simpleType name="AssemblyRValue_simple">
<xs:restriction base="xs:double">
<xs:minExclusive value="0"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="AssemblyRValue">
<xs:simpleContent>
<xs:extension base="AssemblyRValue_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="DoorThirdPartyCertifications_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="Energy Star"/>
Expand Down Expand Up @@ -1760,6 +1772,7 @@
<xs:simpleType name="CoolingEfficiencyUnits_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="SEER"/>
<xs:enumeration value="CEER"/>
<xs:enumeration value="EER"/>
<xs:enumeration value="COP"/>
<xs:enumeration value="kW/ton"/>
Expand Down Expand Up @@ -1863,81 +1876,7 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<!--Heating System Information Below-->
<xs:simpleType name="AFUE_simple">
<xs:restriction base="xs:double">
<xs:minInclusive value="1"/>
<xs:maxInclusive value="100"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="AFUE">
<xs:simpleContent>
<xs:extension base="AFUE_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="COP_simple">
<xs:restriction base="xs:double">
<xs:minExclusive value="0"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="COP">
<xs:simpleContent>
<xs:extension base="COP_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<!--HVAC Distribution Below-->
<xs:simpleType name="HSPF_simple">
<xs:restriction base="xs:double">
<xs:minInclusive value="0"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="HSPF">
<xs:simpleContent>
<xs:extension base="HSPF_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="SEER_simple">
<xs:restriction base="xs:double">
<xs:minInclusive value="0"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="SEER">
<xs:simpleContent>
<xs:extension base="SEER_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="EER_simple">
<xs:restriction base="xs:double">
<xs:minInclusive value="0"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="EER">
<xs:simpleContent>
<xs:extension base="EER_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="kWperTon_simple">
<xs:restriction base="xs:double">
<xs:minInclusive value="0"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="kWperTon">
<xs:simpleContent>
<xs:extension base="kWperTon_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="DuctType_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="supply"/>
Expand Down Expand Up @@ -2866,6 +2805,20 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="GlazingMaterial_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="glass"/>
<xs:enumeration value="plastic"/>
<xs:enumeration value="other"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="GlazingMaterial">
<xs:simpleContent>
<xs:extension base="GlazingMaterial_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="ClothesWasherType_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="top loader"/>
Expand Down Expand Up @@ -4206,6 +4159,21 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="FramingType_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="platform"/>
<xs:enumeration value="balloon"/>
<xs:enumeration value="timber"/>
<xs:enumeration value="other"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="FramingType">
<xs:simpleContent>
<xs:extension base="FramingType_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="AtticWallType_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="gable"/>
Expand Down Expand Up @@ -4530,4 +4498,23 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:schema>
<xs:simpleType name="PerformanceClass_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="residential"/>
<xs:enumeration value="architectural"/>
<xs:enumeration value="light commercial"/>
<xs:enumeration value="commercial"/>
<xs:enumeration value="heavy commercial"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="PerformanceClass">
<xs:annotation>
<xs:documentation>The North American Fenestration Standard/Specification for windows, doors and, skylights provides a method for rating the structural performance, water resistance and air leakage of fenestration products.</xs:documentation>
</xs:annotation>
<xs:simpleContent>
<xs:extension base="PerformanceClass_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:schema>

0 comments on commit a2f92b0

Please sign in to comment.